diff --git a/src/init.cpp b/src/init.cpp
index 903ca8555..6f7f91988 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1911,7 +1911,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
             PruneAndFlush();
         }
     }
-    if ( KOMODO_NSPV > 0 )
+    if ( KOMODO_NSPV >= 0 )
     {
         if ( GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX) != 0 )
             nLocalServices |= NODE_ADDRINDEX;
diff --git a/src/main.cpp b/src/main.cpp
index 9cffe8a76..c232b44ea 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7503,7 +7503,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
     }
     else if (strCommand == "getnSPV")
     {
-        if ( KOMODO_NSPV == 0 )
+        if ( KOMODO_NSPV == 0 && KOMODO_INSYNC != 0 )
         {
             std::vector<uint8_t> payload;
             vRecv >> payload;