diff --git a/space/services/auth.service.ts b/space/services/auth.service.ts
index e182054790..8333e412cd 100644
--- a/space/services/auth.service.ts
+++ b/space/services/auth.service.ts
@@ -3,7 +3,7 @@ import { ICsrfTokenData, IEmailCheckData, IEmailCheckResponse } from "@plane/typ
 // helpers
 import { API_BASE_URL } from "@/helpers/common.helper";
 // services
-import APIService from "@/services/api.service";
+import { APIService } from "@/services/api.service";
 
 export class AuthService extends APIService {
   constructor() {
diff --git a/space/services/file.service.ts b/space/services/file.service.ts
index e8ccfcad48..0e277af1e2 100644
--- a/space/services/file.service.ts
+++ b/space/services/file.service.ts
@@ -2,7 +2,7 @@ import axios from "axios";
 // helpers
 import { API_BASE_URL } from "@/helpers/common.helper";
 // services
-import APIService from "@/services/api.service";
+import { APIService } from "@/services/api.service";
 
 interface UnSplashImage {
   id: string;
diff --git a/space/services/issue.service.ts b/space/services/issue.service.ts
index aa54e500e0..1913b678e0 100644
--- a/space/services/issue.service.ts
+++ b/space/services/issue.service.ts
@@ -1,6 +1,6 @@
 import { API_BASE_URL } from "@/helpers/common.helper";
 // services
-import APIService from "@/services/api.service";
+import { APIService } from "@/services/api.service";
 
 class IssueService extends APIService {
   constructor() {
diff --git a/space/services/project-member.service.ts b/space/services/project-member.service.ts
index c1c2c27325..264d533869 100644
--- a/space/services/project-member.service.ts
+++ b/space/services/project-member.service.ts
@@ -2,7 +2,7 @@
 import type { IProjectMember, IProjectMembership } from "@plane/types";
 import { API_BASE_URL } from "@/helpers/common.helper";
 // services
-import APIService from "@/services/api.service";
+import { APIService } from "@/services/api.service";
 
 export class ProjectMemberService extends APIService {
   constructor() {
diff --git a/space/services/project.service.ts b/space/services/project.service.ts
index bff754595a..14ed7837b3 100644
--- a/space/services/project.service.ts
+++ b/space/services/project.service.ts
@@ -1,6 +1,6 @@
 import { API_BASE_URL } from "@/helpers/common.helper";
 // services
-import APIService from "@/services/api.service";
+import { APIService } from "@/services/api.service";
 
 class ProjectService extends APIService {
   constructor() {
diff --git a/space/services/user.service.ts b/space/services/user.service.ts
index 72500a0483..1aeb134668 100644
--- a/space/services/user.service.ts
+++ b/space/services/user.service.ts
@@ -3,7 +3,7 @@ import { IUser, TUserProfile } from "@plane/types";
 // helpers
 import { API_BASE_URL } from "@/helpers/common.helper";
 // services
-import APIService from "@/services/api.service";
+import { APIService } from "@/services/api.service";
 
 export class UserService extends APIService {
   constructor() {
diff --git a/web/helpers/common.helper.ts b/web/helpers/common.helper.ts
index cc173b4974..2f4814194d 100644
--- a/web/helpers/common.helper.ts
+++ b/web/helpers/common.helper.ts
@@ -6,7 +6,7 @@ export const API_BASE_URL = process.env.NEXT_PUBLIC_API_BASE_URL || "";
 export const ADMIN_BASE_URL = process.env.NEXT_PUBLIC_ADMIN_BASE_URL || "";
 export const ADMIN_BASE_PATH = process.env.NEXT_PUBLIC_ADMIN_BASE_PATH || "";
 
-export const SPACE_BASE_URL = process.env.NEXT_PUBLIC_SPACE_BASE_URL || window.location.origin;
+export const SPACE_BASE_URL = process.env.NEXT_PUBLIC_SPACE_BASE_URL || "";
 export const SPACE_BASE_PATH = process.env.NEXT_PUBLIC_SPACE_BASE_PATH || "";
 
 export const debounce = (func: any, wait: number, immediate: boolean = false) => {