diff --git a/src/p_map.c b/src/p_map.c
index 6beca92f1..8b00397ca 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -2884,7 +2884,7 @@ static boolean P_ThingHeightClip(mobj_t *thing)
 	if (thing->z != oldz)
 	{
 		if (thing->player)
-			P_PlayerHitFloor(thing->player, false);
+			P_PlayerHitFloor(thing->player, !onfloor);
 	}
 
 	// debug: be sure it falls to the floor
diff --git a/src/p_user.c b/src/p_user.c
index 128d4e7d7..c583e076b 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -2194,10 +2194,13 @@ boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff)
 
 	if ((clipmomz = !(P_CheckDeathPitCollide(player->mo))) && player->mo->health && !player->spectator)
 	{
-		if (dorollstuff && (player->charability2 == CA2_SPINDASH) && !(player->pflags & PF_THOKKED) && (player->cmd.buttons & BT_USE) && (FixedHypot(player->mo->momx, player->mo->momy) > (5*player->mo->scale)))
-			player->pflags |= PF_SPINNING;
-		else if (!(player->pflags & PF_STARTDASH))
-			player->pflags &= ~PF_SPINNING;
+		if (dorollstuff)
+		{
+			if ((player->charability2 == CA2_SPINDASH) && !(player->pflags & PF_THOKKED) && (player->cmd.buttons & BT_USE) && (FixedHypot(player->mo->momx, player->mo->momy) > (5*player->mo->scale)))
+				player->pflags |= PF_SPINNING;
+			else if (!(player->pflags & PF_STARTDASH))
+				player->pflags &= ~PF_SPINNING;
+		}
 
 		if (player->pflags & PF_SPINNING)
 		{