diff --git a/src/game/behaviors/pokey.inc.c b/src/game/behaviors/pokey.inc.c
index 4d6b39c7..150d6feb 100644
--- a/src/game/behaviors/pokey.inc.c
+++ b/src/game/behaviors/pokey.inc.c
@@ -143,7 +143,7 @@ static void pokey_act_uninitialized(void) {
     s32 i;
     s16 partModel;
 
-    if (o->oDistanceToMario < 4000.0f) {
+    if (o->oDistanceToMario < o->oDrawingDistance) {
         partModel = MODEL_POKEY_HEAD;
 
         for (i = 0; i < POKEY_NUM_SEGMENTS; i++) {
@@ -177,7 +177,7 @@ static void pokey_act_wander(void) {
 
     if (o->oPokeyNumAliveBodyParts == POKEY_PART_BP_HEAD) {
         obj_mark_for_deletion(o);
-    } else if (o->oDistanceToMario > 4500.0f) {
+    } else if (o->oDistanceToMario > (o->oDrawingDistance + 500.0f)) {
         o->oAction = POKEY_ACT_UNLOAD_PARTS;
         o->oForwardVel = 0.0f;
     } else {