diff --git a/pom.xml b/pom.xml
index 3d34515..3b7a6cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>com.rsscripting</groupId>
     <artifactId>rs-mobstand</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
 
     <name>RS-MobStand</name>
 
diff --git a/src/main/java/com/rsscripting/mobstand/listeners/MenuListener.java b/src/main/java/com/rsscripting/mobstand/listeners/MenuListener.java
index a3576b4..0911145 100644
--- a/src/main/java/com/rsscripting/mobstand/listeners/MenuListener.java
+++ b/src/main/java/com/rsscripting/mobstand/listeners/MenuListener.java
@@ -829,9 +829,31 @@ public class MenuListener implements Listener {
 
             }
 
-            // Arms toggle
+// Arms toggle
             if (event.getSlot() == 22) {
 
+                boolean mainHandOccupied =
+                        !armorStand.getEquipment()
+                                .getItemInMainHand()
+                                .getType()
+                                .isAir();
+
+                boolean offHandOccupied =
+                        !armorStand.getEquipment()
+                                .getItemInOffHand()
+                                .getType()
+                                .isAir();
+
+                if (mainHandOccupied || offHandOccupied) {
+
+                    player.sendMessage(
+                            ChatColor.RED
+                                    + "You must remove all items from the MobStand's hands before disabling its arms."
+                    );
+
+                    return;
+                }
+
                 boolean arms =
                         armorStand.hasArms();
 
@@ -842,9 +864,9 @@ public class MenuListener implements Listener {
                 player.sendMessage(
                         arms
                                 ? ChatColor.GREEN
-                                  + "MobStand arms enabled."
+                                  + "MobStand arms added."
                                 : ChatColor.GREEN
-                                  + "MobStand arms disabled."
+                                  + "MobStand arms removed."
                 );
 
                 StandMenu.open(