diff --git a/deluge/ui/console/commands/quit.py b/deluge/ui/console/commands/quit.py
index 87547e674..7053604d3 100644
--- a/deluge/ui/console/commands/quit.py
+++ b/deluge/ui/console/commands/quit.py
@@ -24,10 +24,13 @@
 #
 from deluge.ui.client import client
 from deluge.ui.console.main import BaseCommand
+from twisted.internet import reactor
 
 class Command(BaseCommand):
     """Exit from the client."""
     aliases = ['exit']
     def handle(self, *args, **options):
-        print "Thanks!"
-        raise StopIteration
+        if client.connected():
+            def on_disconnect(result):
+                reactor.stop()
+            client.disconnect().addCallback(on_disconnect)