diff --git a/packages/website/src/components/Guesser.tsx b/packages/website/src/components/Guesser.tsx
index 3600ee417..e10baace6 100644
--- a/packages/website/src/components/Guesser.tsx
+++ b/packages/website/src/components/Guesser.tsx
@@ -189,6 +189,8 @@ export function Guesser() {
 
                     Guess.mutate((draft) => {
                       if (isSelected) {
+                        if (draft.tiers.length === 1) return;
+
                         draft.tiers = draft.tiers.filter((t) => t !== tier);
                       } else {
                         draft.tiers = [...draft.tiers, tier];
@@ -290,7 +292,6 @@ export function Guesser() {
 
         <Button
           size="3"
-          disabled={tiers.length === 0}
           color={
             guessState === GuessState.NotGuessed && selected === null
               ? "red"
diff --git a/packages/website/src/pages/[...locale]/guess/_index.tsx b/packages/website/src/pages/[...locale]/guess/_index.tsx
index b549bd0bc..d172884ff 100644
--- a/packages/website/src/pages/[...locale]/guess/_index.tsx
+++ b/packages/website/src/pages/[...locale]/guess/_index.tsx
@@ -1,4 +1,4 @@
-import { Box, Flex, Heading, Text } from "@radix-ui/themes";
+import { Box, Flex, Heading } from "@radix-ui/themes";
 import { Suspense, useEffect } from "react";
 import { GuessBackground } from "../../../components/GuessBackground";
 import { Guesser } from "../../../components/Guesser";
@@ -65,7 +65,9 @@ function Content({ skeleton }: MaybeSkeletonComponentProps) {
   const tiers = Guess.use((state) => state.tiers);
 
   useEffect(() => {
-    if (tiers.length === 0) return;
+    const isTankAlreadyCompliant = tiers.includes(tank.tier);
+
+    if (isTankAlreadyCompliant) return;
 
     const filteredIds = ids.filter((id) => {
       const tank = tankDefinitions.tanks[Number(id)];
@@ -90,27 +92,6 @@ function Content({ skeleton }: MaybeSkeletonComponentProps) {
     <Flex flexGrow="1" position="relative" overflow="hidden">
       <GuessBackground />
 
-      {tiers.length === 0 && (
-        <Box
-          position="absolute"
-          top="50%"
-          left="50%"
-          style={{
-            transform: "translate(-50%, -50%)",
-            zIndex: 100,
-            textAlign: "center",
-          }}
-        >
-          <Text
-            size="8"
-            weight="bold"
-            style={{ color: "white", textShadow: "0 2px 8px rgba(0,0,0,0.5)" }}
-          >
-            Select tier(s) to start playing
-          </Text>
-        </Box>
-      )}
-
       <Heading
         style={{
           transitionDuration,