diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp
index eb8f08bab..0871c0992 100644
--- a/sdrbase/webapi/webapirequestmapper.cpp
+++ b/sdrbase/webapi/webapirequestmapper.cpp
@@ -2737,16 +2737,12 @@ bool WebAPIRequestMapper::validateAMBEDevices(SWGSDRangel::SWGAMBEDevices& ambeD
                     return false;
                 }
             }
-        }
-        else
-        {
-            return false;
+
+            return true;
         }
     }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }
 
 void WebAPIRequestMapper::appendSettingsSubKeys(