diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp
index 0f01522d15..1ff46faf0f 100644
--- a/src/p_pspr.cpp
+++ b/src/p_pspr.cpp
@@ -214,10 +214,6 @@ DPSprite *player_t::GetPSprite(PSPLayers layer)
 		{ // The targeter layers were affected by those.
 			pspr->Flags |= (PSPF_CVARFAST|PSPF_POWDOUBLE);
 		}
-		if (layer != PSP_FLASH)
-		{ // Only the flash layer should follow the weapon.
-			pspr->Flags &= ~PSPF_ADDWEAPON;
-		}
 	}
 
 	return pspr;
diff --git a/src/r_things.cpp b/src/r_things.cpp
index caca6a11c9..91c88afa97 100644
--- a/src/r_things.cpp
+++ b/src/r_things.cpp
@@ -1337,7 +1337,7 @@ void R_DrawPSprite(DPSprite *pspr, AActor *owner, float bobx, float boby, double
 		sy += boby;
 	}
 
-	if (pspr->Flags & PSPF_ADDWEAPON)
+	if (pspr->Flags & PSPF_ADDWEAPON && pspr->GetID() != PSP_WEAPON)
 	{
 		sx += wx;
 		sy += wy;