diff --git a/code/modules/events/camera_damage.dm b/code/modules/events/camera_damage.dm
index 3205a93137..6a86581b70 100644
--- a/code/modules/events/camera_damage.dm
+++ b/code/modules/events/camera_damage.dm
@@ -33,6 +33,6 @@
 	return acquire_random_camera(remaining_attempts--)
 
 /datum/event/camera_damage/proc/is_valid_camera(var/obj/machinery/camera/C)
-	// Only return a functional camera, not installed in a silicon, and that exists somewhere players have access
+	// Only return a functional camera, not installed in a silicon/hardsuit/circuit/etc, and that exists somewhere players have access
 	var/turf/T = get_turf(C)
-	return T && C.can_use() && !istype(C.loc, /mob/living/silicon) && (T.z in using_map.player_levels)
+	return T && C.can_use() && istype(C.loc, /turf) && (T.z in using_map.player_levels)
diff --git a/code/modules/gamemaster/actions/camera_damage.dm b/code/modules/gamemaster/actions/camera_damage.dm
index 0f1ef38e9c..e064c3cb1f 100644
--- a/code/modules/gamemaster/actions/camera_damage.dm
+++ b/code/modules/gamemaster/actions/camera_damage.dm
@@ -44,9 +44,9 @@
 	return acquire_random_camera(remaining_attempts--)
 
 /datum/gm_action/camera_damage/proc/is_valid_camera(var/obj/machinery/camera/C)
-	// Only return a functional camera, not installed in a silicon, and that exists somewhere players have access
+	// Only return a functional camera, not installed in a silicon/hardsuit/circuit/etc, and that exists somewhere players have access
 	var/turf/T = get_turf(C)
-	return T && C.can_use() && !istype(C.loc, /mob/living/silicon) && (T.z in using_map.player_levels)
+	return T && C.can_use() && istype(C.loc, /turf) && (T.z in using_map.player_levels)
 
 /datum/gm_action/camera_damage/get_weight()
 	return 40 + (metric.count_people_in_department(ROLE_ENGINEERING) * 20) + (metric.count_people_in_department(ROLE_SYNTHETIC) * 40)