diff --git a/packages/vite/src/node/server/middlewares/htmlFallback.ts b/packages/vite/src/node/server/middlewares/htmlFallback.ts
index 314f4ec2a63e7f..7976d24c0b09f0 100644
--- a/packages/vite/src/node/server/middlewares/htmlFallback.ts
+++ b/packages/vite/src/node/server/middlewares/htmlFallback.ts
@@ -14,17 +14,15 @@ export function htmlFallbackMiddleware(
     rewrites: [
       {
         from: /\/$/,
-        to({ parsedUrl }: any) {
+        to({ parsedUrl, request }: any) {
           const rewritten =
             decodeURIComponent(parsedUrl.pathname) + 'index.html'
 
           if (fs.existsSync(path.join(root, rewritten))) {
             return rewritten
-          } else {
-            if (spaFallback) {
-              return `/index.html`
-            }
           }
+
+          return spaFallback ? `/index.html` : request.url
         }
       }
     ]