diff --git a/src/p_mobj.c b/src/p_mobj.c
index f1dc5d760..60ba7ed2d 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -1990,6 +1990,8 @@ void P_XYMovement(mobj_t *mo)
 				{
 					mo->momz = transfermomz;
 					mo->standingslope = NULL;
+					if (player->pflags & PF_SPINNING)
+						player->pflags = (player->pflags & ~PF_SPINNING) | (P_GetJumpFlags(player) | PF_THOKKED);
 				}
 			}
 #endif