diff --git a/changelog b/changelog
index ddcb5cc9232..834f4e6d30c 100644
--- a/changelog
+++ b/changelog
@@ -67,6 +67,7 @@ Version 1.11.15+dev:
      incorrectly set more helpful.
    * Fix bug in Random Recruit Micro AI: the AI can now handle custom castle
      terrain independent of its terrain code
+   * Fix bug in Return Guardian Micro AI when there is no path to the return hex
 
 Version 1.11.15:
  * Graphics:
diff --git a/data/ai/micro_ais/cas/ca_return_guardian.lua b/data/ai/micro_ais/cas/ca_return_guardian.lua
index 60536bb682d..2bbb6d20dae 100644
--- a/data/ai/micro_ais/cas/ca_return_guardian.lua
+++ b/data/ai/micro_ais/cas/ca_return_guardian.lua
@@ -35,6 +35,8 @@ function ca_return_guardian:execution(ai, cfg)
     end
 
     local nh = AH.next_hop(guardian, x, y)
+    if (not nh) then nh = { guardian.x, guardian.y } end
+
     AH.movefull_stopunit(ai, guardian, nh)
 end