diff --git a/src/init.cpp b/src/init.cpp
index 2336a9101..e2df87ed1 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1464,7 +1464,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     uiInterface.InitMessage(_("Activating best chain..."));
     // scan for better chains in the block chain database, that are not yet connected in the active best chain
     CValidationState state;
-    if (!ActivateBestChain(state))
+    if (KOMODO_REWIND == 0 && !ActivateBestChain(state))
         strErrors << "Failed to connect best block";
 
     std::vector<boost::filesystem::path> vImportFiles;
diff --git a/src/main.cpp b/src/main.cpp
index bd530461a..e3ea9cab7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2870,12 +2870,7 @@ bool ActivateBestChain(CValidationState &state, CBlock *pblock) {
                 return true;
 
             if (!ActivateBestChainStep(state, pindexMostWork, pblock && pblock->GetHash() == pindexMostWork->GetBlockHash() ? pblock : NULL))
-            {
-                if ( KOMODO_REWIND == 0 )
-                    return false;
-                fprintf(stderr,"ActivateBestChainStep rewind case\n");
-                return true;
-            }
+                return false;
             pindexNewTip = chainActive.Tip();
             fInitialDownload = IsInitialBlockDownload();
         }