diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp
index a1d7157e13..ebfc14da33 100644
--- a/src/p_pspr.cpp
+++ b/src/p_pspr.cpp
@@ -1163,8 +1163,8 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_ClearOverlays)
 	player_t *player = self->player;
 	if (!start && !stop)
 	{
-		start = -INT_MAX;
-		stop = PSP_TARGETCENTER - 1;
+		start = INT_MIN;
+		stop = safety ? PSP_TARGETCENTER - 1 : INT_MAX;
 	}
 
 	int count = 0;