diff --git a/packages/junon-io/server/commands/setting.js b/packages/junon-io/server/commands/setting.js
index 0138c54..8acbfb6 100644
--- a/packages/junon-io/server/commands/setting.js
+++ b/packages/junon-io/server/commands/setting.js
@@ -41,11 +41,7 @@ class Setting extends BaseCommand {
       return
     }
 
-    if (!this.sector.settings[key]) {
-      player.showChatError("invalid key. Valid keys are: " + Object.keys(this.sector.settings).join(", "))
-      return
-    }
-
+    
     if (["true", "false"].indexOf(value) === -1) {
       player.showChatError("invalid value. true/false accepted only")
       return
@@ -54,6 +50,11 @@ class Setting extends BaseCommand {
     if (value === 'true') value = true
     if (value === 'false') value = false
 
+   if (this.sector.settings[key] === undefined || this.sector.settings[key] === null) {
+      player.showChatError("invalid key. Valid keys are: " + Object.keys(this.sector.settings).join(", "))
+      return
+    }
+    
     this.sector.editSetting(key, value)
     player.showChatSuccess(key + " set to " + value)
   }