diff --git a/src/miner.cpp b/src/miner.cpp
index 6452533b4..f9f8f3c8b 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -929,8 +929,8 @@ int32_t waitForPeers(const CChainParams &chainparams)
             
             do {
                 if (fvNodesEmpty)
-                    MilliSleep(1000 + rand() % 4000);
                 {
+                    MilliSleep(1000 + rand() % 4000);
                     boost::this_thread::interruption_point();
                     LOCK(cs_vNodes);
                     fvNodesEmpty = vNodes.empty();
@@ -945,7 +945,7 @@ int32_t waitForPeers(const CChainParams &chainparams)
                     }
                     else
                     {
-                        if (++loops <= 90)
+                        if (++loops <= 10)
                         {
                             MilliSleep(1000);
                         }
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 8f4782228..34b4d6a9d 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -615,8 +615,8 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
         
         do {
             if (fvNodesEmpty)
-                MilliSleep(1000 + rand() % 4000);
             {
+                MilliSleep(1000 + rand() % 4000);
                 LOCK(cs_vNodes);
                 fvNodesEmpty = vNodes.empty();
                 loops = 0;
@@ -630,7 +630,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
                 }
                 else
                 {
-                    if (++loops <= 30)
+                    if (++loops <= 10)
                     {
                         MilliSleep(1000);
                     }
@@ -638,7 +638,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
                 }
             }
         } while (fvNodesEmpty || IsNotInSync());
-        if (loops > 30)
+        if (loops > 10)
             throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Cannot get a block template while no peers are connected or chain not in sync!");
     }