diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
index 8f015131b1..39ec5a228e 100644
--- a/code/game/turfs/simulated/water.dm
+++ b/code/game/turfs/simulated/water.dm
@@ -29,11 +29,11 @@
 	handle_fish()
 	// soundloop = new(list(src), FALSE) // CHOMPEdit: Removing soundloop for now.
 	// soundloop.start() // CHOMPEdit: Removing soundloop for now.
-	
+
 /turf/simulated/floor/water/Destroy()
 	// soundloop.stop() // CHOMPEdit: Removing soundloop for now.
 	// QDEL_NULL(soundloop) // CHOMPEdit: Removing soundloop for now.
-	
+
 	. = ..()
 
 /turf/simulated/floor/water/update_icon()
@@ -201,7 +201,13 @@ var/list/shoreline_icon_cache = list()
 		add_overlay(shoreline_icon_cache[cache_string])
 
 /turf/simulated/floor/water/is_safe_to_enter(mob/living/L)
-	if(L.get_water_protection() < 1 || /datum/traits/positive/aquatic in L.species.traits) //CHOMPEDIT: Aquatic flags simulated water as safe now
+	 //CHOMPEDIT: Aquatic flags simulated water as safe now
+	if(istype(L,/mob/living/carbon))
+		var /mob/living/carbon/A = L
+		if(/datum/trait/positive/aquatic in A.species.traits)
+			return TRUE
+		 //CHOMPEDIT: Aquatic flags simulated water as safe now
+	if(L.get_water_protection() < 1)
 		return FALSE
 	return ..()