diff --git a/src/i18n/routing.ts b/src/i18n/routing.ts
index 6cdaa0f..aca2499 100644
--- a/src/i18n/routing.ts
+++ b/src/i18n/routing.ts
@@ -3,5 +3,5 @@ import { defineRouting } from 'next-intl/routing';
 export const routing = defineRouting({
   locales: ['sr', 'en'],
   defaultLocale: 'sr',
-  localePrefix: 'as-needed'
+  localePrefix: 'never'
 });
diff --git a/src/middleware.ts b/src/middleware.ts
index e73c385..a5de095 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -4,5 +4,10 @@ import { routing } from './i18n/routing';
 export default createMiddleware(routing);
 
 export const config = {
-  matcher: ['/((?!api|_next|_vercel|.*\\..*).*)']
+  // Match all pathnames except for
+  // - /api routes
+  // - /_next (Next.js internals)
+  // - /_vercel (Vercel internals)
+  // - all root files inside /public (e.g. /favicon.ico)
+  matcher: ['/((?!api|_next|_vercel|_next/static|_next/image|favicon.ico|robots.txt|sitemap.xml).*)']
 };