diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts
index 35c47fdd0..91051cfb9 100644
--- a/apps/api/src/lib/common.ts
+++ b/apps/api/src/lib/common.ts
@@ -17,7 +17,7 @@ import { day } from './dayjs';
 import { saveBuildLog } from './buildPacks/common';
 import { scheduler } from './scheduler';
 
-export const version = '3.11.9';
+export const version = '3.11.10';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';
diff --git a/apps/api/src/routes/api/v1/services/handlers.ts b/apps/api/src/routes/api/v1/services/handlers.ts
index b1d3dd463..bd6199614 100644
--- a/apps/api/src/routes/api/v1/services/handlers.ts
+++ b/apps/api/src/routes/api/v1/services/handlers.ts
@@ -82,14 +82,18 @@ export async function getServiceStatus(request: FastifyRequest<OnlyId>) {
             if (containersArray.length > 0 && containersArray[0] !== '') {
                 const templates = await getTemplates();
                 let template = templates.find(t => t.type === service.type);
-                template = JSON.parse(JSON.stringify(template).replaceAll('$$id', service.id));
+                console.log(service.type)
+                const templateStr = JSON.stringify(template)
+                if (templateStr) {
+                    template = JSON.parse(templateStr.replaceAll('$$id', service.id));
+                }
                 for (const container of containersArray) {
                     let isRunning = false;
                     let isExited = false;
                     let isRestarting = false;
                     let isExcluded = false;
                     const containerObj = JSON.parse(container);
-                    const exclude = template.services[containerObj.Names]?.exclude;
+                    const exclude = template?.services[containerObj.Names]?.exclude;
                     if (exclude) {
                         payload[containerObj.Names] = {
                             status: {
diff --git a/apps/ui/src/lib/api.ts b/apps/ui/src/lib/api.ts
index 7341d580b..058ec083f 100644
--- a/apps/ui/src/lib/api.ts
+++ b/apps/ui/src/lib/api.ts
@@ -11,7 +11,7 @@ export function getAPIUrl() {
 		return `https://${CODESANDBOX_HOST.replace(/\$PORT/, '3001')}`;
 	}
 	return dev
-		? 'http://localhost:3001'
+		? `http://${window.location.hostname}:3001`
 		: 'http://localhost:3000';
 }
 export function getWebhookUrl(type: string) {
diff --git a/apps/ui/src/lib/store.ts b/apps/ui/src/lib/store.ts
index 27403e1b7..ed5b386b9 100644
--- a/apps/ui/src/lib/store.ts
+++ b/apps/ui/src/lib/store.ts
@@ -3,7 +3,7 @@ import cuid from 'cuid';
 import Cookies from 'js-cookie';
 import { writable, readable, type Writable } from 'svelte/store';
 import { io as ioClient } from 'socket.io-client';
-const socket = ioClient(dev ? 'http://localhost:3001' : '/', { auth: { token: Cookies.get('token') }, autoConnect: false });
+const socket = ioClient(dev ? `http://${window.location.hostname}:3001` : '/', { auth: { token: Cookies.get('token') }, autoConnect: false });
 
 export const io = socket;
 interface AppSession {
diff --git a/package.json b/package.json
index beff849b9..48ecdd60b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "coolify",
   "description": "An open-source & self-hostable Heroku / Netlify alternative.",
-  "version": "3.11.9",
+  "version": "3.11.10",
   "license": "Apache-2.0",
   "repository": "github:coollabsio/coolify",
   "scripts": {