diff --git a/DetectionManager.cpp b/DetectionManager.cpp
index b076f621..607a32f5 100644
--- a/DetectionManager.cpp
+++ b/DetectionManager.cpp
@@ -741,7 +741,7 @@ void DetectionManager::BackgroundDetectDevices()
     \*-----------------------------------------------------*/
     if(initial_detection)
     {
-        if(initial_detection_delay_ms != 0)
+        if(initial_detection_delay_ms > 0)
         {
             detection_string = "Waiting for detection delay";
             SignalUpdate(DETECTIONMANAGER_UPDATE_REASON_DETECTION_PROGRESS_CHANGED);
diff --git a/ResourceManager.cpp b/ResourceManager.cpp
index 9166b7d2..e5b2b4f7 100644
--- a/ResourceManager.cpp
+++ b/ResourceManager.cpp
@@ -241,6 +241,7 @@ ResourceManager::ResourceManager()
     detection_settings_schema["initial_detection_delay_ms"]["title"]        = QT_TRANSLATE_NOOP("Settings", "Initial Detection Delay (ms)");
     detection_settings_schema["initial_detection_delay_ms"]["type"]         = "integer";
     detection_settings_schema["initial_detection_delay_ms"]["description"]  = QT_TRANSLATE_NOOP("Settings", "Amount of time, in milliseconds, to wait before detecting devices when started");
+    detection_settings_schema["initial_detection_delay_ms"]["minimum"]      = 0;
 
     settings_manager->RegisterSettingsSchemaIgnoreFilter("Detectors", QT_TRANSLATE_NOOP("Settings", "Detection"), detection_settings_schema);