diff --git a/mythtv/libs/libmythbase/loggingserver.cpp b/mythtv/libs/libmythbase/loggingserver.cpp
index b925792ffc9..f3b68ef9f98 100644
--- a/mythtv/libs/libmythbase/loggingserver.cpp
+++ b/mythtv/libs/libmythbase/loggingserver.cpp
@@ -989,9 +989,9 @@ void logServerWait(void)
 {
     // cerr << "waiting" << endl;
     QMutexLocker locker(&logThreadStartedMutex);
-    while (!logThreadStarting ||
-           (logServerThread && logServerThread->isRunning()))
-        logThreadStarted.wait(locker.mutex(), 100);
+    while ((!logThreadStarting ||
+            (logServerThread && logServerThread->isRunning())) &&
+           !logThreadStarted.wait(locker.mutex(), 100));
     locker.unlock();
     // cerr << "done waiting" << endl;
 }