diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java
index a1307f724..e789ed78e 100644
--- a/src/resources/objects/SWGObject.java
+++ b/src/resources/objects/SWGObject.java
@@ -799,6 +799,18 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 			destroyObject(aware.getOwner());
 	}
 	
+	public void clearCustomAware(boolean sendUpdates) {
+		synchronized (customAware) {
+			if (sendUpdates) {
+				for (SWGObject aware : customAware) {
+					if (aware.getOwner() != null)
+						destroyObject(aware.getOwner());
+				}
+			}
+			customAware.clear();
+		}
+	}
+	
 	public Set<SWGObject> getObservers() {
 		Player owner = getOwner();
 		SWGObject parent = getParent();
diff --git a/src/services/player/ZoneManager.java b/src/services/player/ZoneManager.java
index aa303381d..b938e4212 100644
--- a/src/services/player/ZoneManager.java
+++ b/src/services/player/ZoneManager.java
@@ -222,6 +222,7 @@ public class ZoneManager extends Manager {
 	private void initPlayerBeforeZoneIn(Player player, CreatureObject creatureObj, PlayerObject playerObj) {
 		creatureObj.setMoodId(CreatureMood.NONE.getMood());
 		playerObj.clearFlagBitmask(PlayerFlags.LD);	// Ziggy: Clear the LD flag in case it wasn't already.
+		creatureObj.clearCustomAware(false);
 	}
 	
 	private void handleShowBackpack(Player player, ShowBackpack p) {