diff --git a/src/index.ts b/src/index.ts
index d26cdad..5db2141 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -6,6 +6,8 @@ import { Elysia } from "elysia";
 import api from "./api";
 import { openInEditor } from "./utils/open-in-editor";
 
+const PORT = process.env.PORT || 3000;
+
 const isProduction = process.env.NODE_ENV === "production";
 
 const app = new Elysia().use(api);
@@ -198,10 +200,10 @@ if (!isProduction) {
 	});
 }
 
-app.listen(3000);
+app.listen(PORT);
 
 console.log(
-	`🚀 Server running at http://localhost:3000 in ${isProduction ? "production" : "development"} mode`,
+	`🚀 Server running at http://localhost:${PORT} in ${isProduction ? "production" : "development"} mode`,
 );
 
 export type ApiApp = typeof app;
diff --git a/src/utils/api-client.ts b/src/utils/api-client.ts
index e20b6e6..e404c44 100644
--- a/src/utils/api-client.ts
+++ b/src/utils/api-client.ts
@@ -2,11 +2,7 @@ import createClient from "openapi-fetch";
 import type { paths } from "../../generated/api";
 import { VITE_PUBLIC_URL } from "./env";
 
-const baseUrl =
-	VITE_PUBLIC_URL ||
-	(typeof window !== "undefined"
-		? window.location.origin
-		: "http://localhost:3000");
+const baseUrl = VITE_PUBLIC_URL;
 
 export const apiClient = createClient<paths>({
 	baseUrl: baseUrl,
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index 1d9728d..90bb7e7 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -38,7 +38,6 @@ export const auth = betterAuth({
 		},
 	},
 	secret: process.env.BETTER_AUTH_SECRET,
-	trustedOrigins: ["http://localhost:5173", "http://localhost:3000"],
 	session: {
 		cookieCache: {
 			enabled: true,