diff --git a/chat/public/admin.js b/chat/public/admin.js
index 26dd161..9cc872c 100644
--- a/chat/public/admin.js
+++ b/chat/public/admin.js
@@ -1588,7 +1588,6 @@
     state.configured = data.models || []; // Legacy support
     renderOpencodeModels();
     renderPublicModels();
-    populateOpencodeModelSelect();
     const selectedAutoModel = state.planSettings && typeof state.planSettings.freePlanModel === 'string'
       ? state.planSettings.freePlanModel
       : (el.autoModelSelect ? el.autoModelSelect.value : '');
@@ -2546,6 +2545,10 @@
         () => (el.externalTestingConfig ? loadExternalTestingStatus() : null),
       ];
       await Promise.all(loaders.map((fn) => fn()).filter(Boolean));
+      // Populate opencode model select after loadAvailable() has completed
+      if (el.opencodeModelSelect) {
+        populateOpencodeModelSelect();
+      }
       // Always try to load provider limits if not already loaded (needed for backup dropdown)
       if (!state.providerModels || Object.keys(state.providerModels).length === 0) {
         try {