diff --git a/public/app.js b/public/app.js
index b269baa..153399a 100644
--- a/public/app.js
+++ b/public/app.js
@@ -23,8 +23,8 @@ document.getElementById('leaseStart').addEventListener('change', (e) => {
   schedulePreview();
 });
 
-templateSelect.addEventListener('change', () => {
-  loadTemplateDefaults(templateSelect.value);
+templateSelect.addEventListener('change', async () => {
+  await loadTemplateDefaults(templateSelect.value);
   loadPreview();
 });
 
@@ -123,7 +123,7 @@ async function loadTemplates() {
     }
 
     connectionStatus.textContent = '可使用';
-    loadTemplateDefaults(templateSelect.value);
+    await loadTemplateDefaults(templateSelect.value);
     loadPreview();
   } catch (error) {
     templateSelect.append(new Option('讀取失敗', ''));