diff --git a/system/gluster_volume.py b/system/gluster_volume.py
index ff1ce9831db..ea74c25f166 100644
--- a/system/gluster_volume.py
+++ b/system/gluster_volume.py
@@ -353,6 +353,9 @@ def main():
     if cluster != None and cluster[-1] == '':
         cluster = cluster[0:-1]
 
+    if cluster == None:
+        cluster = [myhostname]
+
     if brick_paths != None and "," in brick_paths:
         brick_paths = brick_paths.split(",")
     else: