diff --git a/src/st_carousel.c b/src/st_carousel.c
index 2da588c0..a0fabd5c 100644
--- a/src/st_carousel.c
+++ b/src/st_carousel.c
@@ -144,7 +144,8 @@ void ST_UpdateCarousel(player_t *player)
         return;
     }
 
-    if (player->switching == weapswitch_none)
+    if (player->switching == weapswitch_none
+        && player->pendingweapon == wp_nochange)
     {
         --duration;
     }