diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts
index c51fd246f..33748315c 100644
--- a/apps/api/src/lib/common.ts
+++ b/apps/api/src/lib/common.ts
@@ -377,6 +377,7 @@ export async function getContainerUsage(dockerId: string, container: string): Pr
 export async function checkDomainsIsValidInDNS({ hostname, fqdn, dualCerts }): Promise<any> {
 	const { isIP } = await import('is-ip');
 	const domain = getDomain(fqdn);
+	console.log({hostname, fqdn, dualCerts })
 	const domainDualCert = domain.includes('www.') ? domain.replace('www.', '') : `www.${domain}`;
 	dns.setServers(['1.1.1.1', '8.8.8.8']);
 	let resolves = [];
@@ -415,13 +416,16 @@ export async function checkDomainsIsValidInDNS({ hostname, fqdn, dualCerts }): P
 		}
 	} else {
 		try {
+			console.log({domain})
 			const ipDomain = await dns.resolve4(domain);
+			console.log({ipDomain})
 			let ipDomainFound = false;
 			for (const ip of ipDomain) {
 				if (resolves.includes(ip)) {
 					ipDomainFound = true;
 				}
 			}
+			console.log({ipDomainFound})
 			if (ipDomainFound) return { status: 200 };
 			throw { status: 500, message: `DNS not set correctly or propogated.<br>Please check your DNS settings.` }
 		} catch (error) {
diff --git a/apps/api/src/routes/api/v1/applications/handlers.ts b/apps/api/src/routes/api/v1/applications/handlers.ts
index 120e5af98..0d3606187 100644
--- a/apps/api/src/routes/api/v1/applications/handlers.ts
+++ b/apps/api/src/routes/api/v1/applications/handlers.ts
@@ -10,7 +10,7 @@ import { checkContainer, dockerInstance, isContainerExited, removeContainer } fr
 import { scheduler } from '../../../../lib/scheduler';
 
 import type { FastifyRequest } from 'fastify';
-import type { GetImages, CancelDeployment, CheckDNS, CheckRepository, DeleteApplication, DeleteSecret, DeleteStorage, GetApplicationLogs, GetBuildIdLogs, GetBuildLogs, SaveApplication, SaveApplicationSettings, SaveApplicationSource, SaveDeployKey, SaveDestination, SaveSecret, SaveStorage, DeployApplication } from './types';
+import type { GetImages, CancelDeployment, CheckDNS, CheckRepository, DeleteApplication, DeleteSecret, DeleteStorage, GetApplicationLogs, GetBuildIdLogs, GetBuildLogs, SaveApplication, SaveApplicationSettings, SaveApplicationSource, SaveDeployKey, SaveDestination, SaveSecret, SaveStorage, DeployApplication, CheckDomain } from './types';
 import { OnlyId } from '../../../../types';
 
 export async function listApplications(request: FastifyRequest) {
@@ -346,7 +346,16 @@ export async function deleteApplication(request: FastifyRequest<DeleteApplicatio
         return errorHandler({ status, message })
     }
 }
-
+export async function checkDomain(request: FastifyRequest<CheckDomain>) {
+    try {
+        const { id } = request.params
+        const { domain } = request.query
+        const { fqdn, settings: { dualCerts } } = await prisma.application.findUnique({ where: { id }, include: { settings: true } })
+        return await checkDomainsIsValidInDNS({ hostname: domain, fqdn, dualCerts });
+    } catch ({ status, message }) {
+        return errorHandler({ status, message })
+    }
+}
 export async function checkDNS(request: FastifyRequest<CheckDNS>) {
     try {
         const { id } = request.params
@@ -378,7 +387,7 @@ export async function checkDNS(request: FastifyRequest<CheckDNS>) {
         if (isDNSCheckEnabled && !isDev && !forceSave) {
             let hostname = request.hostname.split(':')[0];
             if (remoteEngine) hostname = remoteIpAddress;
-            return await checkDomainsIsValidInDNS({ hostname: request.hostname.split(':')[0], fqdn, dualCerts });
+            return await checkDomainsIsValidInDNS({ hostname, fqdn, dualCerts });
         }
         return {}
     } catch ({ status, message }) {
diff --git a/apps/api/src/routes/api/v1/applications/index.ts b/apps/api/src/routes/api/v1/applications/index.ts
index d6c8e1a76..94ee6dfe8 100644
--- a/apps/api/src/routes/api/v1/applications/index.ts
+++ b/apps/api/src/routes/api/v1/applications/index.ts
@@ -1,8 +1,8 @@
 import { FastifyPluginAsync } from 'fastify';
 import { OnlyId } from '../../../../types';
-import { cancelDeployment, checkDNS, checkRepository, deleteApplication, deleteSecret, deleteStorage, deployApplication, getApplication, getApplicationLogs, getApplicationStatus, getBuildIdLogs, getBuildLogs, getBuildPack, getGitHubToken, getGitLabSSHKey, getImages, getPreviews, getSecrets, getStorages, getUsage, listApplications, newApplication, saveApplication, saveApplicationSettings, saveApplicationSource, saveBuildPack, saveDeployKey, saveDestination, saveGitLabSSHKey, saveRepository, saveSecret, saveStorage, stopApplication } from './handlers';
+import { cancelDeployment, checkDNS, checkDomain, checkRepository, deleteApplication, deleteSecret, deleteStorage, deployApplication, getApplication, getApplicationLogs, getApplicationStatus, getBuildIdLogs, getBuildLogs, getBuildPack, getGitHubToken, getGitLabSSHKey, getImages, getPreviews, getSecrets, getStorages, getUsage, listApplications, newApplication, saveApplication, saveApplicationSettings, saveApplicationSource, saveBuildPack, saveDeployKey, saveDestination, saveGitLabSSHKey, saveRepository, saveSecret, saveStorage, stopApplication } from './handlers';
 
-import type { CancelDeployment, CheckDNS, CheckRepository, DeleteApplication, DeleteSecret, DeleteStorage, DeployApplication, GetApplicationLogs, GetBuildIdLogs, GetBuildLogs, GetImages, SaveApplication, SaveApplicationSettings, SaveApplicationSource, SaveDeployKey, SaveDestination, SaveSecret, SaveStorage } from './types';
+import type { CancelDeployment, CheckDNS, CheckDomain, CheckRepository, DeleteApplication, DeleteSecret, DeleteStorage, DeployApplication, GetApplicationLogs, GetBuildIdLogs, GetBuildLogs, GetImages, SaveApplication, SaveApplicationSettings, SaveApplicationSource, SaveDeployKey, SaveDestination, SaveSecret, SaveStorage } from './types';
 
 const root: FastifyPluginAsync = async (fastify): Promise<void> => {
     fastify.addHook('onRequest', async (request) => {
@@ -22,6 +22,8 @@ const root: FastifyPluginAsync = async (fastify): Promise<void> => {
     fastify.post<OnlyId>('/:id/stop', async (request, reply) => await stopApplication(request, reply));
 
     fastify.post<SaveApplicationSettings>('/:id/settings', async (request, reply) => await saveApplicationSettings(request, reply));
+
+    fastify.get<CheckDomain>('/:id/check', async (request) => await checkDomain(request));
     fastify.post<CheckDNS>('/:id/check', async (request) => await checkDNS(request));
 
     fastify.get<OnlyId>('/:id/secrets', async (request) => await getSecrets(request));
diff --git a/apps/api/src/routes/api/v1/applications/types.ts b/apps/api/src/routes/api/v1/applications/types.ts
index 2d9b9913d..440dcc902 100644
--- a/apps/api/src/routes/api/v1/applications/types.ts
+++ b/apps/api/src/routes/api/v1/applications/types.ts
@@ -30,6 +30,9 @@ export interface SaveApplicationSettings extends OnlyId {
 export interface DeleteApplication extends OnlyId {
     Querystring: { domain: string; };
 }
+export interface CheckDomain extends OnlyId {
+    Querystring: { domain: string; };
+}
 export interface CheckDNS extends OnlyId {
     Querystring: { domain: string; };
     Body: {