diff --git a/packages/next/src/middlewares/__tests__/appMiddleware.ts b/packages/next/src/middlewares/__tests__/appMiddleware.ts
new file mode 100644
index 000000000..03c807296
--- /dev/null
+++ b/packages/next/src/middlewares/__tests__/appMiddleware.ts
@@ -0,0 +1,251 @@
+import { NextRequest } from 'next/server';
+import { setHeadstartWPConfig } from '@headstartwp/core/utils';
+import { AppMiddleware } from '../appMidleware';
+
+describe('appMiddleware', () => {
+	it('adds headers', async () => {
+		setHeadstartWPConfig({
+			sourceUrl: 'http://testwp.com',
+		});
+
+		let req = new NextRequest('http://test.com', {
+			method: 'GET',
+		});
+
+		let res = await AppMiddleware(req);
+
+		expect(res.headers.get('x-headstartwp-site')).toBeNull();
+		expect(res.headers.get('x-headstartwp-current-url')).toBe('/');
+
+		req = new NextRequest('http://test.com/post-name', {
+			method: 'GET',
+		});
+
+		res = await AppMiddleware(req);
+
+		expect(res.headers.get('x-headstartwp-site')).toBeNull();
+		expect(res.headers.get('x-headstartwp-current-url')).toBe('/post-name');
+
+		req = new NextRequest('http://test.com/post-name', {
+			method: 'GET',
+		});
+
+		res = await AppMiddleware(req);
+
+		expect(res.headers.get('x-headstartwp-site')).toBeNull();
+		expect(res.headers.get('x-headstartwp-current-url')).toBe('/post-name');
+	});
+
+	it('supports multisite', async () => {
+		setHeadstartWPConfig({
+			sites: [
+				{
+					sourceUrl: 'http://testwp.com',
+					hostUrl: 'http://test.com',
+				},
+				{
+					sourceUrl: 'http://testwp2.com',
+					hostUrl: 'http://test2.com',
+				},
+			],
+		});
+
+		let req = new NextRequest('http://test.com/post-name', {
+			method: 'GET',
+		});
+
+		req.headers.set('host', 'test.com');
+
+		let res = await AppMiddleware(req);
+
+		expect(res.headers.get('x-headstartwp-site')).toBe('test.com');
+		expect(res.headers.get('x-headstartwp-current-url')).toBe('/post-name');
+
+		req = new NextRequest('http://test2.com/post-name', {
+			method: 'GET',
+		});
+
+		req.headers.set('host', 'test2.com');
+
+		res = await AppMiddleware(req);
+
+		expect(res.headers.get('x-middleware-rewrite')).toBe(
+			'http://test2.com/_sites/test2.com/post-name',
+		);
+		expect(res.headers.get('x-headstartwp-site')).toBe('test2.com');
+		expect(res.headers.get('x-headstartwp-current-url')).toBe('/post-name');
+	});
+
+	it('supports multisite with locale', async () => {
+		setHeadstartWPConfig({
+			sites: [
+				{
+					sourceUrl: 'http://testwp.com',
+					hostUrl: 'http://test.com',
+					locale: 'en',
+				},
+				{
+					locale: 'es',
+					sourceUrl: 'http://testwp.com/es',
+					hostUrl: 'http://test.com',
+				},
+			],
+		});
+
+		const req = new NextRequest('http://test2.com/post-name', {
+			method: 'GET',
+			nextConfig: {
+				i18n: {
+					locales: ['en', 'es'],
+					defaultLocale: 'en',
+				},
+			},
+		});
+
+		req.headers.set('host', 'test.com');
+
+		const res = await AppMiddleware(req);
+
+		expect(res.headers.get('x-middleware-rewrite')).toBe(
+			'http://test2.com/_sites/test.com/post-name',
+		);
+		expect(res.headers.get('x-headstartwp-site')).toBe('test.com');
+		expect(res.headers.get('x-headstartwp-current-url')).toBe('/post-name');
+	});
+
+	it('throws site not found if can not find site based on host', async () => {
+		setHeadstartWPConfig({
+			sites: [
+				{
+					sourceUrl: 'http://testwp.com',
+					hostUrl: 'http://test.com',
+				},
+				{
+					sourceUrl: 'http://testwp2.com',
+					hostUrl: 'http://test2.com',
+				},
+			],
+		});
+
+		const req = new NextRequest('http://test4.com/post-name', {
+			method: 'GET',
+		});
+
+		req.headers.set('host', 'test4.com');
+
+		await expect(() => AppMiddleware(req)).rejects.toThrow('Site not found.');
+	});
+
+	it('throws site not found if can not find site based on host and locale', async () => {
+		setHeadstartWPConfig({
+			sites: [
+				{
+					sourceUrl: 'http://testwp.com',
+					hostUrl: 'http://test.com',
+					locale: 'en',
+				},
+				{
+					locale: 'es',
+					sourceUrl: 'http://testwp.com/es',
+					hostUrl: 'http://test.com',
+				},
+			],
+		});
+
+		const req = new NextRequest('http://test2.com/post-name', {
+			method: 'GET',
+			nextConfig: {
+				i18n: {
+					locales: ['zh', 'pr'],
+					defaultLocale: 'pt-br',
+				},
+			},
+		});
+
+		req.headers.set('host', 'test.com');
+
+		await expect(() => AppMiddleware(req)).rejects.toThrow('Site not found.');
+	});
+
+	it('supports multisite in with App Router', async () => {
+		setHeadstartWPConfig({
+			sites: [
+				{
+					sourceUrl: 'http://testwp.com',
+					hostUrl: 'http://test.com',
+				},
+				{
+					sourceUrl: 'http://testwp2.com',
+					hostUrl: 'http://test2.com',
+				},
+			],
+		});
+
+		const req = new NextRequest('http://test2.com/post-name', {
+			method: 'GET',
+		});
+
+		req.headers.set('host', 'test2.com');
+
+		const res = await AppMiddleware(req, { appRouter: true });
+
+		expect(res.headers.get('x-middleware-rewrite')).toBe(
+			'http://test2.com/test2.com/post-name',
+		);
+		expect(res.headers.get('x-headstartwp-site')).toBe('test2.com');
+		expect(res.headers.get('x-headstartwp-current-url')).toBe('/post-name');
+	});
+
+	it('redirect /page/1 to page without 1', async () => {
+		setHeadstartWPConfig({
+			sourceUrl: 'http://testwp.com',
+		});
+
+		const req = new NextRequest('http://test.com/blog/page/1', {
+			method: 'GET',
+		});
+
+		const res = await AppMiddleware(req);
+
+		expect(res.status).toBe(307);
+		expect(res.headers.get('Location')).toBe('http://test.com/blog');
+	});
+
+	it('redirect at middleware if redirectStrategy is always', async () => {
+		setHeadstartWPConfig({
+			sourceUrl: 'http://example.com',
+			redirectStrategy: 'always',
+			hostUrl: 'http://test.com',
+		});
+
+		const req = new NextRequest('http://example.com/redirect-test', {
+			method: 'GET',
+		});
+
+		const res = await AppMiddleware(req);
+
+		expect(res.status).toBe(301);
+		expect(res.headers.get('Location')).toBe('http://test.com/redirected-page');
+	});
+
+	it('skips static or internal requests', async () => {
+		setHeadstartWPConfig({
+			sourceUrl: 'http://example.com',
+			redirectStrategy: 'always',
+		});
+
+		let req = new NextRequest('http://test.com/_next', {
+			method: 'GET',
+		});
+
+		let res = await AppMiddleware(req);
+		expect(res.headers.get('x-headstartwp-current-url')).toBeNull();
+
+		req = new NextRequest('http://test.com/image.png', {
+			method: 'GET',
+		});
+
+		res = await AppMiddleware(req);
+		expect(res.headers.get('x-headstartwp-current-url')).toBeNull();
+	});
+});
diff --git a/packages/next/src/middlewares/appMidleware.ts b/packages/next/src/middlewares/appMidleware.ts
index 96d2fdcfa..b8fdf1a75 100644
--- a/packages/next/src/middlewares/appMidleware.ts
+++ b/packages/next/src/middlewares/appMidleware.ts
@@ -23,6 +23,7 @@ export async function AppMiddleware(
 ) {
 	let response = NextResponse.next();
 	const currentUrl = req.nextUrl.pathname;
+
 	if (isStaticAssetRequest(req) || isInternalRequest(req)) {
 		return response;
 	}
@@ -31,7 +32,11 @@ export async function AppMiddleware(
 	const site = getSiteByHost(hostname, req.nextUrl.locale);
 	const isMultisiteRequest = site !== null && typeof site.sourceUrl !== 'undefined';
 
-	const { redirectStrategy, sourceUrl } = isMultisiteRequest ? site : getHeadstartWPConfig();
+	const {
+		redirectStrategy,
+		sourceUrl,
+		hostUrl = '/',
+	} = isMultisiteRequest ? site : getHeadstartWPConfig();
 
 	if (!sourceUrl) {
 		throw new Error('Site not found.');
@@ -43,7 +48,10 @@ export async function AppMiddleware(
 		const redirect = await fetchRedirect(pathname, sourceUrl || '');
 
 		if (redirect.location) {
-			return NextResponse.redirect(redirect.location, redirect.status);
+			return NextResponse.redirect(
+				`${hostUrl.replace(/\/$/, '')}${redirect.location}`,
+				redirect.status,
+			);
 		}
 	}