diff --git a/src/objects/instawhip.c b/src/objects/instawhip.c
index 10f25fd43..4c711a8b0 100644
--- a/src/objects/instawhip.c
+++ b/src/objects/instawhip.c
@@ -35,5 +35,8 @@ void Obj_InstaWhipThink (mobj_t *whip)
             whip->renderflags &= ~RF_DONTDRAW;
         else
             whip->renderflags |= RF_DONTDRAW;
+
+        if (whip->extravalue2) // Whip has no hitbox but removing it is a pain in the ass
+            whip->renderflags |= RF_DONTDRAW;
     }
 }
\ No newline at end of file