diff --git a/wadsrc/static/zscript/actors/player/player.zs b/wadsrc/static/zscript/actors/player/player.zs
index f2942858e12..df06e9746b2 100644
--- a/wadsrc/static/zscript/actors/player/player.zs
+++ b/wadsrc/static/zscript/actors/player/player.zs
@@ -2347,7 +2347,7 @@ class PlayerPawn : Actor
 	virtual void SwitchWeaponHand(int hand = 0)
 	{
 		let weap = hand == 0 ? player.OffhandWeapon : player.ReadyWeapon;
-		if (weap != null && !weap.bNoHandSwitch)
+		if (weap != null && !weap.bNoHandSwitch && player.playerstate == PST_LIVE)
 		{
 			let nextweap = player.mo.PickNextWeapon(1 - hand);
 			player.OffhandWeapon = player.ReadyWeapon = null;