diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp
index 10f4592..504e65e 100644
--- a/src/AppFrame.cpp
+++ b/src/AppFrame.cpp
@@ -912,7 +912,7 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
 			}
 #else
             // basic demodulators
-            if (dSelection != -1 && dSelection != demod->getDemodulatorType()) {
+            if (dSelection != "" && dSelection != demod->getDemodulatorType()) {
                 demod->setDemodulatorType(dSelection);
             }
 #endif
@@ -974,7 +974,7 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
 		}
 #else
         // basic demodulators
-        if (dSelection != -1 && dSelection != mgr->getLastDemodulatorType()) {
+        if (dSelection != "" && dSelection != mgr->getLastDemodulatorType()) {
             mgr->setLastDemodulatorType(dSelection);
         }
 #endif
diff --git a/src/demod/DemodulatorInstance.cpp b/src/demod/DemodulatorInstance.cpp
index cd1cd03..5f73a2e 100644
--- a/src/demod/DemodulatorInstance.cpp
+++ b/src/demod/DemodulatorInstance.cpp
@@ -312,7 +312,7 @@ int DemodulatorInstance::getDemodulatorLock() {
         return ((ModemDigital *)cModem)->getDemodulatorLock();
     }
 
-    return -1;
+    return 0;
 }
 
 void DemodulatorInstance::setDemodulatorCons(int demod_cons_in) {
@@ -327,7 +327,7 @@ int DemodulatorInstance::getDemodulatorCons() {
     if (cModem && cModem->getType() == "digital") {
         return ((ModemDigital *)cModem)->getDemodulatorCons();
     }
-    return -1;
+    return 0;
 }
 
 void DemodulatorInstance::setBandwidth(int bw) {