diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 8760ef441..8a515507e 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -2211,8 +2211,8 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     block_from_future_rejecttime = (uint32_t)GetAdjustedTime() + 57;    
     for (i=winners=0; i<numkp; i++)
     {
-        if (fRequestShutdown)
-            break;
+        if ( fRequestShutdown || !GetBoolArg("-gen",false) )
+            return(0);
         if ( (tipindex= chainActive.Tip()) == 0 || tipindex->GetHeight()+1 > nHeight )
         {
             fprintf(stderr,"chain tip changed during staking loop t.%u counter.%d\n",(uint32_t)time(NULL),counter);
diff --git a/src/miner.cpp b/src/miner.cpp
index d8b4e7a80..9a70fc113 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -535,6 +535,8 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
                         fprintf(stderr, "Block Arrived, reset staking loop.\n");
                         return(0);
                     }
+                    if( !GetBoolArg("-gen",false )
+                        return(0);
                 }
             }
 
@@ -1563,6 +1565,13 @@ void static BitcoinMiner()
 #endif
             if ( ptr == 0 )
             {
+                if ( !GetBoolArg("-gen",false))
+                {
+                    miningTimer.stop();
+                    c.disconnect();
+                    LogPrintf("KomodoMiner terminated\n");
+                    return;
+                }
                 static uint32_t counter;
                 if ( counter++ < 10 && ASSETCHAINS_STAKED == 0 )
                     fprintf(stderr,"created illegal blockB, retry\n");