diff --git a/app/messages/api/queue/insert-incoming-message.ts b/app/messages/api/queue/insert-incoming-message.ts
new file mode 100644
index 0000000..ced6c9c
--- /dev/null
+++ b/app/messages/api/queue/insert-incoming-message.ts
@@ -0,0 +1,95 @@
+import { Queue } from "quirrel/blitz";
+import type { MessageInstance } from "twilio/lib/rest/api/v2010/account/message";
+import twilio from "twilio";
+
+import db, { Direction, MessageStatus } from "../../../../db";
+import { encrypt } from "../../../../db/_encryption";
+
+type Payload = {
+	customerId: string;
+	messageSid: MessageInstance["sid"];
+};
+
+const insertIncomingMessageQueue = Queue<Payload>(
+	"api/queue/insert-incoming-message",
+	async ({ messageSid, customerId }) => {
+		const customer = await db.customer.findFirst({ where: { id: customerId } });
+		if (!customer || !customer.accountSid || !customer.authToken) {
+			return;
+		}
+
+		const encryptionKey = customer.encryptionKey;
+		const message = await twilio(customer.accountSid, customer.authToken)
+			.messages.get(messageSid)
+			.fetch();
+		await db.message.create({
+			data: {
+				customerId,
+				to: message.to,
+				from: message.from,
+				status: translateStatus(message.status),
+				direction: translateDirection(message.direction),
+				sentAt: message.dateCreated,
+				content: encrypt(message.body, customer.encryptionKey),
+			},
+		});
+
+		await db.message.createMany({
+			data: {
+				customerId,
+				content: encrypt(message.body, encryptionKey),
+				from: message.from,
+				to: message.to,
+				status: translateStatus(message.status),
+				direction: translateDirection(message.direction),
+				twilioSid: message.sid,
+				sentAt: new Date(message.dateCreated),
+			},
+		});
+	}
+);
+
+export default insertIncomingMessageQueue;
+
+function translateDirection(direction: MessageInstance["direction"]): Direction {
+	switch (direction) {
+		case "inbound":
+			return Direction.Inbound;
+		case "outbound-api":
+		case "outbound-call":
+		case "outbound-reply":
+		default:
+			return Direction.Outbound;
+	}
+}
+
+function translateStatus(status: MessageInstance["status"]): MessageStatus {
+	switch (status) {
+		case "accepted":
+			return MessageStatus.Accepted;
+		case "canceled":
+			return MessageStatus.Canceled;
+		case "delivered":
+			return MessageStatus.Delivered;
+		case "failed":
+			return MessageStatus.Failed;
+		case "partially_delivered":
+			return MessageStatus.PartiallyDelivered;
+		case "queued":
+			return MessageStatus.Queued;
+		case "read":
+			return MessageStatus.Read;
+		case "received":
+			return MessageStatus.Received;
+		case "receiving":
+			return MessageStatus.Receiving;
+		case "scheduled":
+			return MessageStatus.Scheduled;
+		case "sending":
+			return MessageStatus.Sending;
+		case "sent":
+			return MessageStatus.Sent;
+		case "undelivered":
+			return MessageStatus.Undelivered;
+	}
+}
diff --git a/app/messages/api/webhook/incoming-message.ts b/app/messages/api/webhook/incoming-message.ts
index a30635b..0f1c2ba 100644
--- a/app/messages/api/webhook/incoming-message.ts
+++ b/app/messages/api/webhook/incoming-message.ts
@@ -1,13 +1,14 @@
 import type { BlitzApiRequest, BlitzApiResponse } from "blitz";
+import { getConfig } from "blitz";
 import twilio from "twilio";
 
 import type { ApiError } from "../../../api/_types";
 import appLogger from "../../../../integrations/logger";
-import { encrypt } from "../../../../db/_encryption";
-import db, { Direction, MessageStatus } from "../../../../db";
-import { MessageInstance } from "twilio/lib/rest/api/v2010/account/message";
+import db from "../../../../db";
+import insertIncomingMessageQueue from "../queue/insert-incoming-message";
 
 const logger = appLogger.child({ route: "/api/webhook/incoming-message" });
+const { serverRuntimeConfig } = getConfig();
 
 export default async function incomingMessageHandler(req: BlitzApiRequest, res: BlitzApiResponse) {
 	if (req.method !== "POST") {
@@ -36,16 +37,13 @@ export default async function incomingMessageHandler(req: BlitzApiRequest, res:
 		return;
 	}
 
-	console.log("req.body", req.body);
-	// TODO: return 200 and process this in the background
+	const body: Body = req.body;
 	try {
-		const phoneNumber = req.body.To;
 		const customerPhoneNumber = await db.phoneNumber.findFirst({
-			where: { phoneNumber },
+			where: { phoneNumber: body.To },
 		});
-		console.log("customerPhoneNumber", customerPhoneNumber);
 		if (!customerPhoneNumber) {
-			// phone number is not registered by any customer
+			// phone number is not registered by any of our customer
 			res.status(200).end();
 			return;
 		}
@@ -53,20 +51,18 @@ export default async function incomingMessageHandler(req: BlitzApiRequest, res:
 		const customer = await db.customer.findFirst({
 			where: { id: customerPhoneNumber.customerId },
 		});
-		console.log("customer", customer);
 		if (!customer || !customer.authToken) {
 			res.status(200).end();
 			return;
 		}
 
-		const url = "https://4cbc3f38c23a.ngrok.io/api/webhook/incoming-message";
+		const url = `https://${serverRuntimeConfig.app.baseUrl}/api/webhook/incoming-message`;
 		const isRequestValid = twilio.validateRequest(
 			customer.authToken,
 			twilioSignature,
 			url,
 			req.body
 		);
-		console.log("isRequestValid", isRequestValid);
 		if (!isRequestValid) {
 			const statusCode = 400;
 			const apiError: ApiError = {
@@ -81,22 +77,16 @@ export default async function incomingMessageHandler(req: BlitzApiRequest, res:
 
 		// TODO: send notification
 
-		const body: Body = req.body;
 		const messageSid = body.MessageSid;
-		const message = await twilio(customer.accountSid!, customer.authToken)
-			.messages.get(messageSid)
-			.fetch();
-		await db.message.create({
-			data: {
+		await insertIncomingMessageQueue.enqueue(
+			{
+				messageSid,
 				customerId: customer.id,
-				to: message.to,
-				from: message.from,
-				status: translateStatus(message.status),
-				direction: translateDirection(message.direction),
-				sentAt: message.dateCreated,
-				content: encrypt(message.body, customer.encryptionKey),
 			},
-		});
+			{ id: messageSid }
+		);
+
+		res.status(200).end();
 	} catch (error) {
 		const statusCode = error.statusCode ?? 500;
 		const apiError: ApiError = {
@@ -130,46 +120,3 @@ type Body = {
 	From: string;
 	ApiVersion: string;
 };
-
-function translateDirection(direction: MessageInstance["direction"]): Direction {
-	switch (direction) {
-		case "inbound":
-			return Direction.Inbound;
-		case "outbound-api":
-		case "outbound-call":
-		case "outbound-reply":
-		default:
-			return Direction.Outbound;
-	}
-}
-
-function translateStatus(status: MessageInstance["status"]): MessageStatus {
-	switch (status) {
-		case "accepted":
-			return MessageStatus.Accepted;
-		case "canceled":
-			return MessageStatus.Canceled;
-		case "delivered":
-			return MessageStatus.Delivered;
-		case "failed":
-			return MessageStatus.Failed;
-		case "partially_delivered":
-			return MessageStatus.PartiallyDelivered;
-		case "queued":
-			return MessageStatus.Queued;
-		case "read":
-			return MessageStatus.Read;
-		case "received":
-			return MessageStatus.Received;
-		case "receiving":
-			return MessageStatus.Receiving;
-		case "scheduled":
-			return MessageStatus.Scheduled;
-		case "sending":
-			return MessageStatus.Sending;
-		case "sent":
-			return MessageStatus.Sent;
-		case "undelivered":
-			return MessageStatus.Undelivered;
-	}
-}
diff --git a/blitz.config.ts b/blitz.config.ts
index 3b01690..c6e6227 100644
--- a/blitz.config.ts
+++ b/blitz.config.ts
@@ -23,6 +23,9 @@ const config: BlitzConfig = {
 			audienceId: process.env.MAILCHIMP_AUDIENCE_ID,
 		},
 		masterEncryptionKey: process.env.MASTER_ENCRYPTION_KEY,
+		app: {
+			baseUrl: process.env.QUIRREL_BASE_URL,
+		},
 	},
 	/* Uncomment this to customize the webpack config
 	webpack: (config, { buildId, dev, isServer, defaultLoaders, webpack }) => {