diff --git a/src/Squidex/Startup.cs b/src/Squidex/Startup.cs
index ffb910f47..cc96ea758 100644
--- a/src/Squidex/Startup.cs
+++ b/src/Squidex/Startup.cs
@@ -152,15 +152,20 @@ namespace Squidex
                 app.UseWebpackProxy();
                 
                 app.Use((context, next) => {
-                    context.Request.Path = new PathString("/index.html");
-
+                    if (context.Response.StatusCode == 404 && !Path.HasExtension(context.Request.Path.Value))
+                    {
+                        context.Request.Path = new PathString("/index.html");
+                    }
                     return next();
                 });
             }
             else
             {
                 app.Use((context, next) => {
-                    context.Request.Path = new PathString("/build/index.html");
+                    if (context.Response.StatusCode == 404 && !Path.HasExtension(context.Request.Path.Value))
+                    {
+                        context.Request.Path = new PathString("/build/index.html");
+                    }
 
                     return next();
                 });