diff --git a/src/Storage.cpp b/src/Storage.cpp
index 5e03649948..e2903e0a5e 100644
--- a/src/Storage.cpp
+++ b/src/Storage.cpp
@@ -1371,6 +1371,7 @@ bool Storage::GetRpcResult(bool blocking, unsigned int call_uid,
     if (i == m_rpc_results.end()) {
       if (!blocking || m_terminating) return false;
       m_rpc_results_cond.wait(lock);
+      if (m_terminating) return false;
       continue;
     }
     result->swap(i->getSecond());