diff --git a/src/blackmisc/worker.cpp b/src/blackmisc/worker.cpp
index 5d3fc7e3f..c35059d2b 100644
--- a/src/blackmisc/worker.cpp
+++ b/src/blackmisc/worker.cpp
@@ -50,7 +50,7 @@ namespace BlackMisc
         }
 #endif
         quit();
-        wait();
+        wait(30 * 1000); //! \todo KB 2017-10 temp workaround: in T145 this will be fixed, sometimes (very rarely) hanging here during shutdown
     }
 
     CWorker *CWorker::fromTaskImpl(QObject *owner, const QString &name, int typeId, std::function<CVariant()> task)