diff --git a/web_interface/templates/v3/partials/fonts.html b/web_interface/templates/v3/partials/fonts.html
index 7d13908a8..43084e02e 100644
--- a/web_interface/templates/v3/partials/fonts.html
+++ b/web_interface/templates/v3/partials/fonts.html
@@ -215,9 +215,6 @@ <h3 class="text-md font-medium text-gray-900 mb-4">Font Preview</h3>
     var fontOverrides = window.fontOverrides;
     var selectedFontFiles = window.selectedFontFiles;
 
-    // Base URL for API calls (shared scope)
-    var baseUrl = window.location.origin;
-
     // Retry counter for initialization
     var initRetryCount = 0;
     var MAX_INIT_RETRIES = 50; // 5 seconds max (50 * 100ms)
@@ -384,9 +381,9 @@ <h3 class="text-md font-medium text-gray-900 mb-4">Font Preview</h3>
     try {
         // Use absolute URLs to ensure they work when loaded via HTMX
         const [catalogRes, tokensRes, overridesRes] = await Promise.all([
-            fetch(`${baseUrl}/api/v3/fonts/catalog`),
-            fetch(`${baseUrl}/api/v3/fonts/tokens`),
-            fetch(`${baseUrl}/api/v3/fonts/overrides`)
+            fetch(`/api/v3/fonts/catalog`),
+            fetch(`/api/v3/fonts/tokens`),
+            fetch(`/api/v3/fonts/overrides`)
         ]);
 
         // Check if all responses are successful
@@ -558,7 +555,7 @@ <h3 class="text-md font-medium text-gray-900 mb-4">Font Preview</h3>
     }
 
     try {
-        const response = await fetch(`${baseUrl}/api/v3/fonts/${encodeURIComponent(fontFamily)}`, {
+        const response = await fetch(`/api/v3/fonts/${encodeURIComponent(fontFamily)}`, {
             method: 'DELETE'
         });
 
@@ -667,7 +664,7 @@ <h3 class="text-md font-medium text-gray-900 mb-4">Font Preview</h3>
             if (sizePx) overrideData.size_px = sizePx;
         }
 
-        const response = await fetch(`${baseUrl}/api/v3/fonts/overrides`, {
+        const response = await fetch(`/api/v3/fonts/overrides`, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify({
@@ -712,7 +709,7 @@ <h3 class="text-md font-medium text-gray-900 mb-4">Font Preview</h3>
     }
 
     try {
-        const response = await fetch(`${baseUrl}/api/v3/fonts/overrides/${elementKey}`, {
+        const response = await fetch(`/api/v3/fonts/overrides/${elementKey}`, {
             method: 'DELETE'
         });
 
@@ -860,7 +857,7 @@ <h3 class="text-md font-medium text-gray-900 mb-4">Font Preview</h3>
             fg: 'ffffff'
         });
 
-        const response = await fetch(`${baseUrl}/api/v3/fonts/preview?${params}`);
+        const response = await fetch(`/api/v3/fonts/preview?${params}`);
 
         if (!response.ok) {
             const text = await response.text();
@@ -990,7 +987,7 @@ <h3 class="text-md font-medium text-gray-900 mb-4">Font Preview</h3>
             formData.append('font_file', file);
             formData.append('font_family', i === 0 ? fontFamily : `${fontFamily}_${i + 1}`);
 
-            const response = await fetch(`${baseUrl}/api/v3/fonts/upload`, {
+            const response = await fetch(`/api/v3/fonts/upload`, {
                 method: 'POST',
                 body: formData
             });