diff --git a/.version b/.version
index 29690d10f0..b71a29b1f9 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.24.3
+2.24.4
diff --git a/frontend/.version b/frontend/.version
index 29690d10f0..b71a29b1f9 100644
--- a/frontend/.version
+++ b/frontend/.version
@@ -1 +1 @@
-2.24.3
+2.24.4
diff --git a/frontend/src/_helpers/routes.js b/frontend/src/_helpers/routes.js
index 183f83a51b..3c4de8c2ea 100644
--- a/frontend/src/_helpers/routes.js
+++ b/frontend/src/_helpers/routes.js
@@ -120,8 +120,10 @@ export const getWorkspaceIdOrSlugFromURL = () => {
 };
 
 export const excludeWorkspaceIdFromURL = (pathname) => {
-  if (!['/integrations', '/applications/', '/switch-workspace'].find((path) => pathname.startsWith(path))) {
-    pathname = getSubpath() ? pathname.replace(getSubpath(), '') : pathname;
+  const subPath = getSubpath();
+  const tempPathname = subPath ? pathname.replace(subPath, '') : pathname;
+  if (!['/integrations', '/applications/', '/switch-workspace'].find((path) => tempPathname.startsWith(path))) {
+    pathname = tempPathname;
     const paths = pathname?.split('/').filter((path) => path !== '');
     paths.shift();
     const newPath = paths.join('/');
diff --git a/server/.version b/server/.version
index 29690d10f0..b71a29b1f9 100644
--- a/server/.version
+++ b/server/.version
@@ -1 +1 @@
-2.24.3
+2.24.4