diff --git a/src/p_user.c b/src/p_user.c
index f789de0d9..44d31ab44 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -12129,6 +12129,10 @@ void P_PlayerThink(player_t *player)
 				case CR_DUSTDEVIL:
 					player->drawangle += ANG20;
 					break;
+				case CR_FAN:
+					if (player->pflags & PF_ANALOGMODE) // Don't impact drawangle in any special way when on a fan
+						player->drawangle = player->mo->angle;
+					break;
 				/* -- in case we wanted to have the camera freely movable during zoom tubes
 				case CR_ZOOMTUBE:*/
 				case CR_ROPEHANG:
@@ -12139,8 +12143,6 @@ void P_PlayerThink(player_t *player)
 					}
 					/* FALLTHRU */
 				default:
-					if (!(player->powers[pw_carry] == CR_FAN && (player->pflags & PF_DIRECTIONCHAR))) // Don't impact drawangle in any special way when on a fan
-						player->drawangle = player->mo->angle;
 					break;
 			}
 		}