diff --git a/daemons/ganeti-confd b/daemons/ganeti-confd
index 88e454bcc5a9578601b9d94c7baef9025b433db4..cf56aa8f2667d14c1fc2d5a45f17e9ecb7edc2f0 100755
--- a/daemons/ganeti-confd
+++ b/daemons/ganeti-confd
@@ -115,7 +115,6 @@ class ConfdInotifyEventHandler(pyinotify.ProcessEvent):
                 pyinotify.EventsCodes.IN_MODIFY
     self.file = file
     self.watch_handle = None
-    self.enable()
 
   def enable(self):
     """Watch the given file
@@ -204,7 +203,7 @@ class ConfdConfigurationReloader(object):
     self.processor = processor
     self.mainloop = mainloop
 
-    self.polling = False
+    self.polling = True
     self.last_notification = 0
 
     # Asyncronous inotify handler for config changes