diff --git a/public/js/quickmenu/carddeck.js b/public/js/quickmenu/carddeck.js
index 5525644..0f93b9d 100644
--- a/public/js/quickmenu/carddeck.js
+++ b/public/js/quickmenu/carddeck.js
@@ -33,6 +33,9 @@ export async function loadCardDeck() {
   const body = document.getElementById("qm-body-carddeck");
   if (!body) return;
 
+  currentDeckId = null;
+  deckCards     = [];
+
   body.innerHTML = renderShell();
   attachShellEvents();
 
@@ -597,6 +600,7 @@ function renderDeckSelect() {
           `<option value="${d.id}" ${d.id === currentDeckId ? "selected" : ""}>${d.name}</option>`,
       )
       .join("");
+  sel.value = currentDeckId || "";
 }
 
 /* ══════════════════════════════════════════════