diff --git a/src/Storage.cpp b/src/Storage.cpp
index b5db2d6a5f..46f0ff34fb 100644
--- a/src/Storage.cpp
+++ b/src/Storage.cpp
@@ -1441,9 +1441,10 @@ bool Storage::GetRpcResult(bool blocking, unsigned int call_uid, double time_out
           m_rpc_blocking_calls.erase(call_uid);
           return false;
         }
-        // if element does not exist, we have been canceled
-        if (m_rpc_blocking_calls.count(call_uid) == 0)
-          return false;
+      }
+      // if element does not exist, we have been canceled
+      if (m_rpc_blocking_calls.count(call_uid) == 0) {
+        return false;
       }
       if (m_terminating) {
         m_rpc_blocking_calls.erase(call_uid);