2 files changed, 9 insertions, 7 deletions
diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index 3dd9913a..bd9bbc01 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -1,6 +1,9 @@
 import { ipStore } from "$lib/server/ip";
+import { setIpGetter } from "$lib/utils";
 import type { Handle } from "@sveltejs/kit";
 
+setIpGetter(() => ipStore.getStore());
+
 export const handle: Handle = async ({ event, resolve }) => {
 	const ip =
 		event.request.headers.get("cf-connecting-ip") ||
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 1b2bdfba..b981a4d4 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -21,15 +21,14 @@ export function scroll(section: any) {
 
 const base = browser ? "" : PUBLIC_COINOS_URL;
 
-let ipStore: any;
-if (!browser) {
-	import("$lib/server/ip").then((m) => {
-		ipStore = m.ipStore;
-	});
-}
+let getIp: (() => string | undefined) | undefined;
+
+export const setIpGetter = (fn: () => string | undefined) => {
+	getIp = fn;
+};
 
 const ipHeaders = (): Record<string, string> => {
-	const ip = ipStore?.getStore();
+	const ip = getIp?.();
 	return ip ? { "cf-connecting-ip": ip } : {};
 };