diff --git a/daemons/ganeti-watcher b/daemons/ganeti-watcher
index fc7fd1be58c500be181bbb71ef6d182cbd662445..ae1f6e54a6741c7a7864c333f681be61d09011a8 100755
--- a/daemons/ganeti-watcher
+++ b/daemons/ganeti-watcher
@@ -36,7 +36,6 @@ from optparse import OptionParser
 from ganeti import utils
 from ganeti import constants
 from ganeti import serializer
-from ganeti import ssconf
 from ganeti import errors
 from ganeti import opcodes
 from ganeti import logger
@@ -282,8 +281,7 @@ class Watcher(object):
 
   """
   def __init__(self):
-    sstore = ssconf.SimpleStore()
-    master = sstore.GetMasterNode()
+    master = client.QueryConfigValues(["master_node"])[0]
     if master != utils.HostInfo().name:
       raise NotMasterError("This is not the master node")
     self.instances = GetInstanceList()