diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index e5aef868fcf..9ae92cdd616 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -479,6 +479,8 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 			continue
 		if(another.validate_location(T))
 			unset_holo(holo_owner)
+			if(another.masters && another.masters[holo_owner])
+				another.clear_holo(holo_owner)
 			another.set_holo(holo_owner, h)
 			return TRUE
 	return FALSE
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index 41c2902c73d..c2c395cabbb 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -96,8 +96,11 @@
 
 // Return to the Core.
 /mob/living/silicon/ai/proc/view_core()
-
-	current = null
+	if(istype(current,/obj/machinery/holopad))
+		var/obj/machinery/holopad/H = current
+		H.clear_holo(src)
+	else
+		current = null
 	cameraFollow = null
 	unset_machine()