diff --git a/ts/routes/reviewer/reviewer-bottom/More.svelte b/ts/routes/reviewer/reviewer-bottom/More.svelte
index 3f11251a5..29eec1f6e 100644
--- a/ts/routes/reviewer/reviewer-bottom/More.svelte
+++ b/ts/routes/reviewer/reviewer-bottom/More.svelte
@@ -88,12 +88,15 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         },
     ];
 
+    const cardData = state.cardData;
+
     function changeFlag(index: number) {
-        setFlag({ cardIds: [state.currentCard!.card!.id], flag: index });
-        state.cardData.update(($cardData) => {
-            $cardData!.queue!.cards[0].card!.flags = index;
-            return $cardData;
-        });
+        const card = $cardData!.queue!.cards[0].card!;
+        if (card.flags === index) {
+            index = 0;
+        }
+        setFlag({ cardIds: [card.id], flag: index });
+        $cardData!.queue!.cards[0].card!.flags = index;
     }
 </script>