diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt
index 547836e10d..f68fbdfb87 100644
--- a/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt
+++ b/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt
@@ -36,7 +36,10 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
         if(selectedUnit!=null)
         {
             try{ selectedUnit!!.getTile()}
-            catch(ex:Exception) {selectedUnit=null} // The unit that was there no longer exists}
+            catch(ex:Exception) {
+                selectedUnit=null;
+                currentlyExecutingAction=null
+            } // The unit that was there no longer exists}
         }
 
         if(selectedUnit!=null) {