diff --git a/2006Redone Server/src/redone/game/bots/BotHandler.java b/2006Redone Server/src/redone/game/bots/BotHandler.java
index 1940a2d1..8b465d71 100644
--- a/2006Redone Server/src/redone/game/bots/BotHandler.java	
+++ b/2006Redone Server/src/redone/game/bots/BotHandler.java	
@@ -102,11 +102,18 @@ public class BotHandler
         return null;
     }
 
-    public static void closeShop(Client player){
+    public static void closeShop(Client player) {
         Client shop = getPlayerShop(player);
         if (shop == null) return;
         shop.disconnected = true;
         shop.logout(true);
+        for (int index = 0; index < botList.size(); index++){
+            if (botList.get(index).getBotClient().properName.equalsIgnoreCase(player.properName)) {
+                botList.remove(index);
+                return;
+            }
+            index++;
+        }
     }
 
     public static void addCoins(int shop_id, int amount){
diff --git a/CompiledServer/production/2006rebotted/redone/game/bots/BotHandler.class b/CompiledServer/production/2006rebotted/redone/game/bots/BotHandler.class
index 120a8e5e..f20611e8 100644
Binary files a/CompiledServer/production/2006rebotted/redone/game/bots/BotHandler.class and b/CompiledServer/production/2006rebotted/redone/game/bots/BotHandler.class differ