diff --git a/base/threaded_list.hpp b/base/threaded_list.hpp
index 326dc2fa7d..82f08cb22e 100644
--- a/base/threaded_list.hpp
+++ b/base/threaded_list.hpp
@@ -16,23 +16,15 @@ private:
 
   bool WaitNonEmpty(std::unique_lock<std::mutex> &lock)
   {
-    bool doFirstWait = true;
-
     while ((m_isEmpty = m_list.empty()))
     {
       if (IsCancelled())
         break;
 
-      if (doFirstWait)
-        doFirstWait = false;
-
       m_Cond.wait(lock);
     }
 
-    if (IsCancelled())
-      return true;
-
-    return false;
+    return IsCancelled();
   }
 public: