diff --git a/src/main/java/altk/comm/engine/Broadcast.java b/src/main/java/altk/comm/engine/Broadcast.java
index 1c0a21d..6303076 100644
--- a/src/main/java/altk/comm/engine/Broadcast.java
+++ b/src/main/java/altk/comm/engine/Broadcast.java
@@ -290,7 +290,7 @@ public abstract class Broadcast
         public void run()
         {
             myLogger.info("Thread starting...");
-            while (! serviceThreadsShouldStop())
+            for (;;)
             {
                 if (serviceThreadsShouldPause())
                 {
@@ -308,6 +308,7 @@ public abstract class Broadcast
                         }
                     }
                 }
+                if (serviceThreadsShouldStop()) break;
                 // Get a batch of jobs, if available
     			myLogger.debug("Looking for jobs");
                 List<Job> batch =  new ArrayList<Job>();