diff --git a/src/engine/InterestManagement/InterestManager.java b/src/engine/InterestManagement/InterestManager.java
index 1987df71..ed1797d1 100644
--- a/src/engine/InterestManagement/InterestManager.java
+++ b/src/engine/InterestManagement/InterestManager.java
@@ -568,11 +568,20 @@ public enum InterestManager implements Runnable {
         }
     }
 
-    public void RefreshLoadedObjects(PlayerCharacter pc){
+    public void RefreshLoadedObjects(PlayerCharacter player){
         try {
-            pc.getLoadedObjects().clear();
-            updateStaticList(pc, pc.getClientConnection());
-            updateMobileList(pc, pc.getClientConnection());
+            if (player == null)
+                return;
+
+            ClientConnection origin = player.getClientConnection();
+
+            if (origin == null)
+                return;
+
+            // Update loaded upbjects lists
+            player.setDirtyLoad(true);
+            updateStaticList(player, origin);
+            updateMobileList(player, origin);
         }catch(Exception e){
             Logger.error(e.getMessage());
         }