diff --git a/src/app/(static)/events-news/page.tsx b/src/app/(static)/events-news/page.tsx
index 00a43f8..38c19d3 100644
--- a/src/app/(static)/events-news/page.tsx
+++ b/src/app/(static)/events-news/page.tsx
@@ -11,9 +11,7 @@ import APP_HOSTNAME from '@/lib';
 
 const INITIAL_NEWS_PAGE = 1;
 
-export default async function EventsNews() {
-  const queryClient = new QueryClient();
-
+const prefetchData = async (queryClient: QueryClient) => {
   await queryClient.prefetchQuery({
     queryKey: queryKeys.events.past.queryKey,
     queryFn: async () => {
@@ -37,7 +35,7 @@ export default async function EventsNews() {
     queryFn: async () => {
       try {
         const response = await fetch(`${APP_HOSTNAME}/events
-`);
+  `);
         if (!response.ok) {
           throw new Error('Failed to fetch upcoming events');
         }
@@ -67,6 +65,12 @@ export default async function EventsNews() {
       }
     },
   });
+};
+
+export default async function EventsNews() {
+  const queryClient = new QueryClient();
+
+  await prefetchData(queryClient);
 
   return (
     <HydrationBoundary state={dehydrate(queryClient)}>
diff --git a/src/lib/index.ts b/src/lib/index.ts
index a0d78bb..a363396 100644
--- a/src/lib/index.ts
+++ b/src/lib/index.ts
@@ -1,5 +1,5 @@
-export const APP_HOSTNAME = process.env.VERCEL_URL
-  ? `https://${process.env.VERCEL_URL}`
+export const APP_HOSTNAME = process.env.NEXT_PUBLIC_VERCEL_URL
+  ? `https://${process.env.NEXT_PUBLIC_VERCEL_URL}`
   : process.env.NEXT_PUBLIC_HOSTNAME;
 
 export default APP_HOSTNAME;