diff --git a/src/lib/haproxy/configuration.ts b/src/lib/haproxy/configuration.ts
index 97cb76c97..0bfebde81 100644
--- a/src/lib/haproxy/configuration.ts
+++ b/src/lib/haproxy/configuration.ts
@@ -112,9 +112,15 @@ export async function haproxyInstance() {
 }
 
 export async function configureHAProxy() {
+	const haproxy = await haproxyInstance();
+
 	try {
-		const haproxy = await haproxyInstance();
 		await checkHAProxy(haproxy);
+	} catch (error) {
+		return 'Error: HAProxy is not running';
+	}
+
+	try {
 		const data = {
 			applications: [],
 			services: [],
diff --git a/src/lib/haproxy/index.ts b/src/lib/haproxy/index.ts
index b41f9035e..39190384d 100644
--- a/src/lib/haproxy/index.ts
+++ b/src/lib/haproxy/index.ts
@@ -49,7 +49,12 @@ export async function completeTransaction(transactionId) {
 }
 export async function deleteProxy({ id }) {
 	const haproxy = await haproxyInstance();
-	await checkHAProxy(haproxy);
+	try {
+		await checkHAProxy(haproxy);
+	} catch (error) {
+		return 'Error: HAProxy is not running';
+	}
+
 	let transactionId;
 	try {
 		await haproxy.get(`v2/services/haproxy/configuration/backends/${id}`).json();
diff --git a/src/lib/queues/proxy.ts b/src/lib/queues/proxy.ts
index 3705139ce..a29b2a223 100644
--- a/src/lib/queues/proxy.ts
+++ b/src/lib/queues/proxy.ts
@@ -1,4 +1,3 @@
-import { dev } from '$app/env';
 import { ErrorHandler } from '$lib/database';
 import { configureHAProxy } from '$lib/haproxy/configuration';