diff --git a/code/game/alternate_appearance.dm b/code/game/alternate_appearance.dm
index 53e7d6704fd..891d7725313 100644
--- a/code/game/alternate_appearance.dm
+++ b/code/game/alternate_appearance.dm
@@ -30,7 +30,7 @@
 		if(!M.viewing_alternate_appearances)
 			M.viewing_alternate_appearances = list()
 		viewers |= M
-		M.viewing_alternate_appearances += src
+		M.viewing_alternate_appearances |= src
 		if(M.client)
 			M.client.images |= img
 
@@ -117,8 +117,7 @@
 /atom/proc/remove_alt_appearance(key)
 	if(alternate_appearances)
 		if(alternate_appearances[key])
-			var/datum/alternate_appearance/AA = alternate_appearances[key]
-			qdel(AA)
+			qdel(alternate_appearances[key])
 
 
 /*
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 77054087e31..cc9788a15fe 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -14,6 +14,10 @@
 	following_mobs = null
 	if(buckled)
 		buckled.unbuckle_mob()
+	if(viewing_alternate_appearances)
+		for(var/datum/alternate_appearance/AA in viewing_alternate_appearances)
+			AA.viewers -= src
+		viewing_alternate_appearances = null
 	return ..()
 
 /mob/New()