diff --git a/frontend/src/logo.js b/frontend/src/logo.js
index 81304c1..aaafd6e 100644
--- a/frontend/src/logo.js
+++ b/frontend/src/logo.js
@@ -2,7 +2,7 @@ import './style.css'
 import gsap from 'gsap'
 
 // Configuration
-const API_BASE_URL = ''  // Requests will be made to the same origin, and Vite will proxy /logos to the backend
+const API_BASE_URL = window.location.hostname === 'localhost' ? '/api' : 'http://localhost:8080'
 
 // Get UUID from URL
 const urlParams = new URLSearchParams(window.location.search)
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index db98819..0859caa 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -7,11 +7,10 @@ export default defineConfig({
     port: 3000,
     open: true,
     proxy: {
-      // Proxy all /logos/* requests to the backend
-      '^/logos/.*': {
+      '/api': {
         target: process.env.VITE_API_URL || 'http://localhost:8080',
         changeOrigin: true,
-        secure: false
+        rewrite: (path) => path.replace(/^\/api/, '')
       }
     }
   },