diff --git a/src/static/app/index.html b/src/static/app/index.html
index 7cfbd9e1..5a5aa987 100644
--- a/src/static/app/index.html
+++ b/src/static/app/index.html
@@ -6,13 +6,24 @@
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="application-name" content="WGDashboard">
 		<meta name="apple-mobile-web-app-title" content="WGDashboard">
-		<base href="{{ APP_PREFIX if APP_PREFIX else '' }}/">
 		<link rel="manifest" href="./json/manifest.json">
 		<link rel="icon" href="./img/Logo-2-512x512.png">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>WGDashboard</title>
 		<script>
-			window.APP_PREFIX = "{{ APP_PREFIX if APP_PREFIX else '' }}";
+			let appPrefix = "{{ APP_PREFIX if APP_PREFIX else '' }}";
+			if (appPrefix.includes('{' + '{')) {
+				appPrefix = '';
+			}
+			window.APP_PREFIX = appPrefix;
+			const isViteDevMode = document.querySelector('script[src*="@vite/client"]') !== null;
+			const base = document.createElement('base');
+			if (isViteDevMode) {
+				base.href = '/';
+			} else {
+				base.href = (window.APP_PREFIX || '') + '/';
+			}
+			document.head.insertBefore(base, document.head.firstChild);
 		</script>
 	</head>
 	<body>
diff --git a/src/static/client/index.html b/src/static/client/index.html
index e359b6cb..b61c2399 100644
--- a/src/static/client/index.html
+++ b/src/static/client/index.html
@@ -2,7 +2,6 @@
 <html lang="">
 	<head>
 		<meta charset="UTF-8">
-		<base href="{{ APP_PREFIX if APP_PREFIX else '' }}/client/">
 		<link rel="icon" href="./img/Logo-2-128x128.png">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>WGDashboard Client</title>
@@ -30,7 +29,19 @@
             }
         </style>
 		<script>
-			window.APP_PREFIX = "{{ APP_PREFIX if APP_PREFIX else '' }}";
+			let appPrefix = "{{ APP_PREFIX if APP_PREFIX else '' }}";
+			if (appPrefix.includes('{' + '{')) {
+				appPrefix = '';
+			}
+			window.APP_PREFIX = appPrefix;
+			const isViteDevMode = document.querySelector('script[src*="@vite/client"]') !== null;
+			const base = document.createElement('base');
+			if (isViteDevMode) {
+				base.href = '/';
+			} else {
+				base.href = (window.APP_PREFIX || '') + '/client/';
+			}
+			document.head.insertBefore(base, document.head.firstChild);
 		</script>
 	</head>
 	<body>
