diff --git a/sitecompanion/settings.js b/sitecompanion/settings.js
index 1e9689b..d8507c3 100644
--- a/sitecompanion/settings.js
+++ b/sitecompanion/settings.js
@@ -1952,7 +1952,9 @@ function updateEnvApiOptionsForContainer(container, apiConfigs) {
   if (!container) return;
   const selects = container.querySelectorAll(".env-config-api-select");
   selects.forEach((select) => {
-    select.dataset.preferred = select.value;
+    if (select.value) {
+      select.dataset.preferred = select.value;
+    }
     populateSelect(select, apiConfigs, "No API configs configured");
   });
 }
@@ -2195,15 +2197,21 @@ function updateShortcutOptionsForContainer(container, options = {}) {
     const profileSelect = card.querySelector(".shortcut-profile");
     const taskSelect = card.querySelector(".shortcut-task");
     if (envSelect) {
-      envSelect.dataset.preferred = envSelect.value;
+      if (envSelect.value) {
+        envSelect.dataset.preferred = envSelect.value;
+      }
       populateSelect(envSelect, envs, "No environments configured");
     }
     if (profileSelect) {
-      profileSelect.dataset.preferred = profileSelect.value;
+      if (profileSelect.value) {
+        profileSelect.dataset.preferred = profileSelect.value;
+      }
       populateSelect(profileSelect, profiles, "No profiles configured");
     }
     if (taskSelect) {
-      taskSelect.dataset.preferred = taskSelect.value;
+      if (taskSelect.value) {
+        taskSelect.dataset.preferred = taskSelect.value;
+      }
       populateSelect(taskSelect, tasks, "No tasks configured");
     }
   });