diff --git a/ChangeLog b/ChangeLog
index 9f831d46e..ab00b7b5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ Deluge 0.9.04 - "1.0.0_RC4" (In Development)
   * Display 'total_wanted' instead of 'total_size' in Size column
   * Fix displaying of torrents when language is not English
   * Fix the view options to be persistent between sessions
+  * Fix signalreceiver when switching between daemons
   
 Deluge 0.9.03 - "1.0.0_RC3" (21 July 2008)
  Core:
diff --git a/deluge/ui/gtkui/signals.py b/deluge/ui/gtkui/signals.py
index b7021619f..e4f569d27 100644
--- a/deluge/ui/gtkui/signals.py
+++ b/deluge/ui/gtkui/signals.py
@@ -48,8 +48,7 @@ class Signals(component.Component):
         self.config.save()
         
     def start(self):
-        if not client.is_localhost():
-            self.receiver.set_remote(True)
+        self.receiver.set_remote(not client.is_localhost())
 
         self.receiver.run()
         self.receiver.connect_to_signal("torrent_added", 
diff --git a/deluge/ui/signalreceiver.py b/deluge/ui/signalreceiver.py
index eb7b83271..c0401f8ce 100644
--- a/deluge/ui/signalreceiver.py
+++ b/deluge/ui/signalreceiver.py
@@ -50,8 +50,6 @@ class SignalReceiver(ThreadingMixIn, SimpleXMLRPCServer.SimpleXMLRPCServer):
     
     def __init__(self):
         log.debug("SignalReceiver init..")
-        # Set to true so that the receiver thread will exit
-        self._shutdown = False
 
         self.signals = {}
         self.emitted_signals = []
@@ -110,6 +108,9 @@ class SignalReceiver(ThreadingMixIn, SimpleXMLRPCServer.SimpleXMLRPCServer):
             
     def run(self):
         """This gets called when we start the thread"""
+        # Set to true so that the receiver thread will exit
+        self._shutdown = False
+
         # Register the signal receiver with the core
         client.register_client(str(self.port))