diff --git a/backend/src/main/java/com/printcalculator/config/CorsConfig.java b/backend/src/main/java/com/printcalculator/config/CorsConfig.java
index 2e6f92c..7d15114 100644
--- a/backend/src/main/java/com/printcalculator/config/CorsConfig.java
+++ b/backend/src/main/java/com/printcalculator/config/CorsConfig.java
@@ -11,7 +11,14 @@ public class CorsConfig implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
-                .allowedOrigins("http://localhost", "http://localhost:4200", "http://localhost:80", "http://127.0.0.1")
+                .allowedOrigins(
+                        "http://localhost",
+                        "http://localhost:4200",
+                        "http://localhost:80",
+                        "http://127.0.0.1",
+                        "https://dev.3d-fab.ch",
+                        "https://3d-fab.ch"
+                )
                 .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
                 .allowedHeaders("*")
                 .allowCredentials(true);
diff --git a/frontend/src/app/app.routes.ts b/frontend/src/app/app.routes.ts
index 66d3c9a..4f51782 100644
--- a/frontend/src/app/app.routes.ts
+++ b/frontend/src/app/app.routes.ts
@@ -32,6 +32,10 @@ export const routes: Routes = [
       {
         path: '',
         loadChildren: () => import('./features/legal/legal.routes').then(m => m.LEGAL_ROUTES)
+      },
+      {
+        path: '**',
+        redirectTo: ''
       }
     ]
   }