diff --git a/MinecraftClient/ChatBots/AutoFishing.cs b/MinecraftClient/ChatBots/AutoFishing.cs
index 55637ec6..b767cdc2 100644
--- a/MinecraftClient/ChatBots/AutoFishing.cs
+++ b/MinecraftClient/ChatBots/AutoFishing.cs
@@ -47,14 +47,36 @@ namespace MinecraftClient.ChatBots
             if (!GetEntityHandlingEnabled())
             {
                 LogToConsoleTranslated("extra.entity_required");
-                LogToConsoleTranslated("general.bot_unload");
-                UnloadBot();
+                state = FishingState.WaitJoinGame;
             }
             inventoryEnabled = GetInventoryEnabled();
             if (!inventoryEnabled)
                 LogToConsoleTranslated("bot.autoFish.no_inv_handle");
         }
 
+        /// <summary>
+        /// Update settings when reloaded
+        /// </summary>
+        public /* override */ void OnSettingsReload()
+        {
+            if (Settings.AutoFishing_Enabled)
+            {
+                if (!GetEntityHandlingEnabled())
+                {
+                    LogToConsoleTranslated("extra.entity_required");
+                    state = FishingState.WaitJoinGame;
+                }
+                inventoryEnabled = GetInventoryEnabled();
+                if (!inventoryEnabled)
+                    LogToConsoleTranslated("bot.autoFish.no_inv_handle");
+            }
+            else
+            {
+                UnloadBot();
+                return;
+            }
+        }
+
         private void StartFishing()
         {
             isFishing = false;