diff --git a/Server/src/main/core/game/activity/ActivityManager.java b/Server/src/main/core/game/activity/ActivityManager.java
index 66858ea56..76d626d60 100644
--- a/Server/src/main/core/game/activity/ActivityManager.java
+++ b/Server/src/main/core/game/activity/ActivityManager.java
@@ -2,6 +2,7 @@ package core.game.activity;
 
 import content.global.skill.construction.HouseZone;
 import core.ServerConstants;
+import core.api.ContentAPIKt;
 import core.game.node.entity.player.Player;
 import core.tools.Log;
 import core.tools.SystemLogger;
@@ -84,7 +85,13 @@ public final class ActivityManager {
 
 	public static void ActivityRecover(Player player) {
 		String activityName = player.getAttribute("lastActivity", null);
-		if (activityName == null) return;
+		if (activityName == null) {
+			if (player.getLocation().getY() < 2000) { //credits to PlayerName
+				sendMessage(player, "You were stuck inside an instance, which should never happen. Please file a bug report, and include the following information: $loc. To prevent your client from crashing, you have been teleported back home. We apologise for the inconvenience.");
+				player.setLocation(ServerConstants.HOME_LOCATION);
+			}
+			return;
+		}
 		//sendMessage(player,player.getUsername() + " recovering from " + activityName);
 		if (activityName.equals("POH-Activity")) {
 			HouseZone.remove_items(player);