diff --git a/src/Signal.c b/src/Signal.c
index 2d86b34..f6c82ad 100644
--- a/src/Signal.c
+++ b/src/Signal.c
@@ -15,12 +15,6 @@ SignalHandler(int signal)
 {
     if (server && (signal == SIGTERM || signal == SIGINT))
     {
-        if (!server)
-        {
-            return;
-        }
-
-        /* TODO: Better way to break out. */
         Log(LOG_INFO, "Killing thread...");
         XMPPFinishCompStream(jabber);
         pthread_join(xmpp_thr, NULL);