diff --git a/src/dehacked.c b/src/dehacked.c
index bb1785695..192f2c712 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -8605,6 +8605,7 @@ struct {
 	{"CR_MINECART",CR_MINECART},
 	{"CR_ROLLOUT", CR_ROLLOUT},
 	{"CR_PTERABYTE",CR_PTERABYTE},
+
 	// Ring weapons (ringweapons_t)
 	// Useful for A_GiveWeapon
 	{"RW_AUTO",RW_AUTO},
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 4388c1bd6..5cd9c27e2 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -9107,6 +9107,12 @@ void P_MobjThinker(mobj_t *mobj)
 						if (!mobj->target)
 							break;
 
+						if (mobj->target->player->powers[pw_flashing])
+						{
+							P_SetTarget(&mobj->target, NULL);
+							break;
+						}
+
 						vdist = mobj->z - mobj->target->z - mobj->target->height;
 						if (vdist <= 0)
 						{