diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index e2eb3ab6a3..aa11cef9fe 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -145,18 +145,6 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 			clear_holo(master)
 			continue
 
-//		if((HOLOPAD_MODE == RANGE_BASED && (get_dist(master.eyeobj, src) > holo_range)))
-//			clear_holo(master)
-//			continue
-
-		if(HOLOPAD_MODE == AREA_BASED)
-			var/area/holo_area = get_area(src)
-			var/area/eye_area = get_area(master.eyeobj)
-
-			if(!(eye_area in holo_area.master.related))
-				clear_holo(master)
-				continue
-
 		use_power(power_per_hologram)
 	return 1
 
@@ -168,6 +156,14 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 		masters[user] = H
 		if((HOLOPAD_MODE == RANGE_BASED && (get_dist(H, src) > holo_range)))
 			clear_holo(user)
+
+		if(HOLOPAD_MODE == AREA_BASED)
+			var/area/holopad_area = get_area(src)
+			var/area/hologram_area = get_area(H)
+
+			if(!(hologram_area in holopad_area.master.related))
+				clear_holo(user)
+
 	return 1
 
 /*