diff --git a/src/objects/super-flicky.cpp b/src/objects/super-flicky.cpp
index 287fa7c7f..6e65e51ad 100644
--- a/src/objects/super-flicky.cpp
+++ b/src/objects/super-flicky.cpp
@@ -765,5 +765,5 @@ boolean Obj_IsSuperFlickyWhippable(const mobj_t* mobj)
 {
 	const Flicky* x = static_cast<const Flicky*>(mobj);
 
-	return !x->stunned();
+	return mobj == x->chasing() && !x->stunned();
 }