diff --git a/src/main/java/net/pingex/dcf/commands/CommandHandler.java b/src/main/java/net/pingex/dcf/commands/CommandHandler.java
index 0731a9d..154a203 100644
--- a/src/main/java/net/pingex/dcf/commands/CommandHandler.java
+++ b/src/main/java/net/pingex/dcf/commands/CommandHandler.java
@@ -67,9 +67,16 @@ public class CommandHandler
 			return;
 		}
 
+		// Enabled check
+		if(!targetCommand.get().isEnabled())
+		{
+			LOGGER.debug("User {} attempted to run a disabled command !", event.getMessage().getAuthor().getID());
+			DiscordInteractionsUtil.sendMessage(event.getMessage().getChannel(), "Command is disabled.");
+			return;
+		}
+
 		// Authorize
-		boolean canRun = PermissionsHandler.canRunCommand(event.getMessage(), targetCommand.get());
-		if(!canRun)
+		if(!PermissionsHandler.canRunCommand(event.getMessage(), targetCommand.get()))
 		{
 			LOGGER.debug("User {} attempted to run a forbidden command !", event.getMessage().getAuthor().getID());
 			DiscordInteractionsUtil.sendMessage(event.getMessage().getChannel(), "Access denied.");