diff --git a/src/main/java/me/mattmoreira/citizenscmd/CitizensCMD.java b/src/main/java/me/mattmoreira/citizenscmd/CitizensCMD.java
index fa419b7..0ea7669 100644
--- a/src/main/java/me/mattmoreira/citizenscmd/CitizensCMD.java
+++ b/src/main/java/me/mattmoreira/citizenscmd/CitizensCMD.java
@@ -68,7 +68,10 @@ public final class CitizensCMD extends JavaPlugin {
 
     public void onEnable() {
 
-        if (!hasCitizens()) {
+        checkOldConfig(this);
+        saveDefaultConfig();
+
+        if (!hasCitizens() && getConfig().getBoolean("citizens-check")) {
             Util.disablePlugin(this);
             return;
         }
@@ -76,8 +79,6 @@ public final class CitizensCMD extends JavaPlugin {
         commandHandler = new CommandHandler(this);
         commandHandler.enable();
 
-        checkOldConfig(this);
-
         new Metrics(this);
 
         info(color(TAG + "&3Citizens&cCMD &8&o" + getDescription().getVersion() + " &8By &3Mateus Moreira &c@LichtHund"));
@@ -90,7 +91,6 @@ public final class CitizensCMD extends JavaPlugin {
         cooldownHandler = new CooldownHandler(this);
         Bukkit.getScheduler().scheduleSyncDelayedTask(this, () -> cooldownHandler.initialize(), 30L);
 
-        saveDefaultConfig();
         registerCommands();
         registerEvents();
 
diff --git a/src/main/java/me/mattmoreira/citizenscmd/commands/base/CommandHandler.java b/src/main/java/me/mattmoreira/citizenscmd/commands/base/CommandHandler.java
index cb26152..78efd52 100644
--- a/src/main/java/me/mattmoreira/citizenscmd/commands/base/CommandHandler.java
+++ b/src/main/java/me/mattmoreira/citizenscmd/commands/base/CommandHandler.java
@@ -157,7 +157,9 @@ public class CommandHandler implements CommandExecutor, TabCompleter, IHandler {
                 switch (subCMD) {
                     case "add":
                         if (args.length == 2) return getCommandNames(subCMD, args, 1, (Player) sender);
-                        if (args.length == 3) return getCommandNames(subCMD, args, 2, (Player) sender);
+                        if (args[1].equalsIgnoreCase("sound")) {
+                            if (args.length == 3) return getCommandNames(subCMD, args, 2, (Player) sender);
+                        }
                         break;
 
                     case "remove":
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index d75f70e..f28c7a6 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -19,4 +19,7 @@ default-cooldown: 0
 shift-confirm: true
 #
 # Select cooldown display format, SHORT = 3m 3s | MEDIUM = 3 min 3 sec | FULL - 3 minutes 3 seconds
-cooldown-time-display: MEDIUM
\ No newline at end of file
+cooldown-time-display: MEDIUM
+#
+# Disables citizens check on startup
+citizens-check: true
\ No newline at end of file