diff --git a/telldus-core/client/CallbackDispatcher.cpp b/telldus-core/client/CallbackDispatcher.cpp
index 99c9a6a7..a1f72263 100644
--- a/telldus-core/client/CallbackDispatcher.cpp
+++ b/telldus-core/client/CallbackDispatcher.cpp
@@ -47,11 +47,8 @@ void TDEventDispatcher::queue(EventDataRef eventData) {
 }
 
 void TDEventDispatcher::run() {
-	while (true) {
+	while (!d->stopEvent->isSignaled()) {
 		d->eventHandler.waitForAny();
-		if (d->stopEvent->isSignaled()) {
-			break;
-		}
 		if (d->callbackEvent->isSignaled()) {
 			TelldusCore::EventDataRef eventData = d->callbackEvent->takeSignal();
 			this->execute(eventData);