diff --git a/application/core/Configurators/ScriptSettings.php b/application/core/Configurators/ScriptSettings.php
index e40cf713..4e7fbfd5 100644
--- a/application/core/Configurators/ScriptSettings.php
+++ b/application/core/Configurators/ScriptSettings.php
@@ -107,10 +107,6 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 			trigger_error($mysqli->error);
 			return false;
 		}
-		if ($result->num_rows <= 0) {
-			$result->close();
-			return true;
-		}
 		
 		$loadedSettings = array();
 		while ($row = $result->fetch_object()) {
@@ -119,6 +115,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
 			settype($loadedSettings[$row->settingName], gettype($scriptSettings[$row->settingName]));
 		}
 		$result->close();
+		if (!$loadedSettings) return true;
 		
 		$success = $this->maniaControl->client->query('SetModeScriptSettings', $loadedSettings);
 		if (!$success) {
diff --git a/application/core/Configurators/ServerSettings.php b/application/core/Configurators/ServerSettings.php
index 6e9f663a..f8dc62f9 100644
--- a/application/core/Configurators/ServerSettings.php
+++ b/application/core/Configurators/ServerSettings.php
@@ -97,10 +97,6 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
 			trigger_error($mysqli->error);
 			return false;
 		}
-		if ($result->num_rows <= 0) {
-			$result->close();
-			return true;
-		}
 		
 		$this->maniaControl->client->query('GetServerOptions');
 		$serverSettings = $this->maniaControl->client->getResponse();
@@ -111,6 +107,7 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
 			settype($loadedSettings[$row->settingName], gettype($serverSettings[$row->settingName]));
 		}
 		$result->close();
+		if (!$loadedSettings) return true;
 		
 		$success = $this->maniaControl->client->query('SetServerOptions', $loadedSettings);
 		if (!$success) {