diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index 81970b0f8a79..6b70301974bd 100644
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -1030,6 +1030,10 @@ public Configuration updateConfiguration(final UpdateCfgCmd cmd) throws InvalidP
             category = config.getCategory();
         }
 
+        if (value == null) {
+            throw new InvalidParameterValueException(String.format("The new value for the [%s] configuration must be given.", name));
+        }
+
         validateIpAddressRelatedConfigValues(name, value);
         validateConflictingConfigValue(name, value);
 
@@ -1038,10 +1042,6 @@ public Configuration updateConfiguration(final UpdateCfgCmd cmd) throws InvalidP
             throw new CloudRuntimeException("Only Root Admin is allowed to edit this configuration.");
         }
 
-        if (value == null) {
-            return _configDao.findByName(name);
-        }
-
         ConfigKey.Scope scope = null;
         Long id = null;
         int paramCountCheck = 0;