diff --git a/src/Geoscape/DogfightState.cpp b/src/Geoscape/DogfightState.cpp
index c2d3061406..3502c6ded9 100644
--- a/src/Geoscape/DogfightState.cpp
+++ b/src/Geoscape/DogfightState.cpp
@@ -1453,7 +1453,8 @@ void DogfightState::update()
 			setStatus("STR_INTERCEPTOR_DESTROYED");
 			if (_ufoIsAttacking)
 			{
-				_craft->evacuateCrew(_game->getMod());
+				// Note: this was moved to GeoscapeState.cpp, as it is not 100% reliable here
+				//_craft->evacuateCrew(_game->getMod());
 			}
 			_timeout += 30;
 			_game->getMod()->getSound("GEO.CAT", Mod::INTERCEPTOR_EXPLODE)->play();
diff --git a/src/Geoscape/GeoscapeState.cpp b/src/Geoscape/GeoscapeState.cpp
index cbe7b40c8e..060d236fc5 100644
--- a/src/Geoscape/GeoscapeState.cpp
+++ b/src/Geoscape/GeoscapeState.cpp
@@ -1123,6 +1123,11 @@ void GeoscapeState::time5Seconds()
 						break;
 					}
 				}
+				//if (_ufoIsAttacking)
+				{
+					// Note: this was moved from DogfightState.cpp, as it was not 100% reliable there
+					xcraft->evacuateCrew(_game->getMod());
+				}
 				// if a transport craft has been shot down, kill all the soldiers on board.
 				if (xcraft->getRules()->getMaxUnits() > 0)
 				{