diff --git a/src/mission.cpp b/src/mission.cpp
index 57ac3fd0a06..a69f873c70c 100644
--- a/src/mission.cpp
+++ b/src/mission.cpp
@@ -150,6 +150,7 @@ static UBYTE   bPlayCountDown;
 
 //FUNCTIONS**************
 static void addLandingLights(UDWORD x, UDWORD y);
+static void resetHomeStructureObjects();
 static bool startMissionOffClear(const char *pGame);
 static bool startMissionOffKeep(const char *pGame);
 static bool startMissionCampaignStart(const char *pGame);
@@ -188,6 +189,38 @@ bool MissionResUp	= false;
 static SDWORD		g_iReinforceTime = 0;
 
 
+//Remove soon-to-be illegal references to objects for some structures before going offWorld.
+static void resetHomeStructureObjects()
+{
+	for (unsigned int i = 0; i < MAX_PLAYERS; ++i)
+	{
+		for (STRUCTURE *psStruct : apsStructLists[i])
+		{
+			if (!psStruct->pFunctionality || !psStruct->pStructureType)
+			{
+				continue;
+			}
+			if (psStruct->pStructureType->type == REF_REPAIR_FACILITY)
+			{
+				REPAIR_FACILITY *psRepairFac = &psStruct->pFunctionality->repairFacility;
+				if (psRepairFac->psObj)
+				{
+					psRepairFac->psObj = nullptr;
+					psRepairFac->state = RepairState::Idle;
+				}
+			}
+			else if (psStruct->pStructureType->type == REF_REARM_PAD)
+			{
+				REARM_PAD *psReArmPad = &psStruct->pFunctionality->rearmPad;
+				if (psReArmPad->psObj)
+				{
+					psReArmPad->psObj = nullptr;
+				}
+			}
+		}
+	}
+}
+
 //returns true if on an off world mission
 bool missionIsOffworld()
 {
@@ -720,6 +753,8 @@ static void saveMissionData()
 		}
 	}
 
+	resetHomeStructureObjects(); //get rid of soon-to-be illegal references of droids in repair facilities and rearming pads.
+
 	//save the mission data
 	mission.psMapTiles = std::move(psMapTiles);
 	mission.mapWidth = mapWidth;