diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index caed00635426501b1bf14f747895cea08d94ff67..57c2dc6b0a989171ca17b88eb21ff44e965f7ee1 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -124,9 +124,8 @@ def ShowClusterMaster(opts, args):
     opts - class with options as members
 
   """
-  op = opcodes.OpQueryClusterInfo()
-  result = SubmitOpCode(op)
-  print (result["master"])
+  sstore = ssconf.SimpleStore()
+  print sstore.GetMasterNode()
   return 0