diff --git a/FFXIVClassic Map Server/actors/chara/player/Player.cs b/FFXIVClassic Map Server/actors/chara/player/Player.cs
index af64253e..2d6686a5 100644
--- a/FFXIVClassic Map Server/actors/chara/player/Player.cs	
+++ b/FFXIVClassic Map Server/actors/chara/player/Player.cs	
@@ -1936,7 +1936,9 @@ namespace FFXIVClassic_Map_Server.Actors
         //If the returned value is outside the hotbar, it indicates it wasn't found.
         private ushort FindFirstCommandSlotById(uint commandId)
         {
-            commandId |= 0xA0F00000;
+            if(commandId != 0)
+                commandId |= 0xA0F00000;
+
             ushort firstSlot = (ushort)(charaWork.commandBorder + 30);
 
             for (ushort i = charaWork.commandBorder; i < charaWork.commandBorder + 30; i++)
diff --git a/sql/characters_hotbar.sql b/sql/characters_hotbar.sql
index 8b6a1523..b9c2ce4d 100644
--- a/sql/characters_hotbar.sql
+++ b/sql/characters_hotbar.sql
@@ -23,13 +23,12 @@ DROP TABLE IF EXISTS `characters_hotbar`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `characters_hotbar` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `characterId` int(10) unsigned NOT NULL,
   `classId` smallint(5) unsigned NOT NULL,
   `hotbarSlot` smallint(5) unsigned NOT NULL,
   `commandId` int(10) unsigned NOT NULL,
   `recastTime` int(10) unsigned DEFAULT NULL,
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`characterId`, `classId`, `hotbarSlot`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;