diff --git a/ui/app/c/[chatId]/page.tsx b/ui/app/c/[chatId]/page.tsx
index 22c8703..dc3c92a 100644
--- a/ui/app/c/[chatId]/page.tsx
+++ b/ui/app/c/[chatId]/page.tsx
@@ -1,31 +1,7 @@
 import ChatWindow from '@/components/ChatWindow';
-import { FC } from 'react';
-import process from 'process';
-import { GetServerSideProps } from 'next';
 
-interface PageProps {
-  backendApiUrl: string;
-  params: {
-    chatId: string;
-  };
-}
-
-export async function getServerSideProps(context): GetServerSideProps<PageProps> {
-  const backendApiUrl = process.env.BACKEND_API_URL;
-  const { chatId } = context.params || {};
-
-  return {
-    props: {
-      backendApiUrl,
-      params: {
-        chatId: chatId || '',
-      },
-    },
-  };
-}
-
-const Page: FC<PageProps> = ({ params, backendApiUrl }) => {
-  return <ChatWindow id={params.chatId} backendApiUrl={backendApiUrl} />;
+const Page = ({ params }: { params: { chatId: string } }) => {
+  return <ChatWindow id={params.chatId} />;
 };
 
 export default Page;
diff --git a/ui/app/library/page.tsx b/ui/app/library/page.tsx
index d444850..d91b04a 100644
--- a/ui/app/library/page.tsx
+++ b/ui/app/library/page.tsx
@@ -4,9 +4,8 @@ import DeleteChat from '@/components/DeleteChat';
 import { formatTimeDifference } from '@/lib/utils';
 import { BookOpenText, ClockIcon, Delete, ScanEye } from 'lucide-react';
 import Link from 'next/link';
-import { useEffect, useState, FC } from 'react';
+import { useEffect, useState } from 'react';
 import process from 'process';
-import { GetServerSideProps } from 'next';
 
 export interface Chat {
   id: string;
@@ -15,21 +14,7 @@ export interface Chat {
   focusMode: string;
 }
 
-interface PageProps {
-  backendApiUrl: string;
-}
-
-export async function getServerSideProps(): GetServerSideProps<PageProps> {
-  const backendApiUrl = process.env.BACKEND_API_URL;
-
-  return {
-    props: {
-      backendApiUrl,
-    },
-  };
-}
-
-const Page: FC<PageProps> = ({ backendApiUrl }) => {
+const Page = () => {
   const [chats, setChats] = useState<Chat[]>([]);
   const [loading, setLoading] = useState(true);
 
@@ -37,7 +22,7 @@ const Page: FC<PageProps> = ({ backendApiUrl }) => {
     const fetchChats = async () => {
       setLoading(true);
 
-      const res = await fetch(`${backendApiUrl}/chats`, {
+      const res = await fetch(`${process.env.BACKEND_API_URL}/chats`, {
         method: 'GET',
         headers: {
           'Content-Type': 'application/json',
@@ -113,7 +98,6 @@ const Page: FC<PageProps> = ({ backendApiUrl }) => {
                   chatId={chat.id}
                   chats={chats}
                   setChats={setChats}
-                  backendApiUrl={backendApiUrl}
                 />
               </div>
             </div>
diff --git a/ui/components/ChatWindow.tsx b/ui/components/ChatWindow.tsx
index a875322..f423013 100644
--- a/ui/components/ChatWindow.tsx
+++ b/ui/components/ChatWindow.tsx
@@ -260,7 +260,7 @@ const loadMessages = async (
   setIsMessagesLoaded(true);
 };
 
-const ChatWindow = ({ id, backendApiUrl }: { id?: string, backendApiUrl: string }) => {
+const ChatWindow = ({ id }: { id?: string }) => {
   const searchParams = useSearchParams();
   const initialMessage = searchParams.get('q');
 
@@ -434,7 +434,7 @@ const ChatWindow = ({ id, backendApiUrl }: { id?: string, backendApiUrl: string
           lastMsg.sources.length > 0 &&
           !lastMsg.suggestions
         ) {
-          const suggestions = await getSuggestions(messagesRef.current, backendApiUrl);
+          const suggestions = await getSuggestions(messagesRef.current);
           setMessages((prev) =>
             prev.map((msg) => {
               if (msg.messageId === lastMsg.messageId) {
diff --git a/ui/components/DeleteChat.tsx b/ui/components/DeleteChat.tsx
index 975f9cb..48ec006 100644
--- a/ui/components/DeleteChat.tsx
+++ b/ui/components/DeleteChat.tsx
@@ -9,12 +9,10 @@ const DeleteChat = ({
   chatId,
   chats,
   setChats,
-  backendApiUrl
 }: {
   chatId: string;
   chats: Chat[];
   setChats: (chats: Chat[]) => void;
-  backendApiUrl: string
 }) => {
   const [confirmationDialogOpen, setConfirmationDialogOpen] = useState(false);
   const [loading, setLoading] = useState(false);
@@ -23,7 +21,7 @@ const DeleteChat = ({
     setLoading(true);
     try {
       const res = await fetch(
-        `${backendApiUrl}/chats/${chatId}`,
+        `${process.env.BACKEND_API_URL}/chats/${chatId}`,
         {
           method: 'DELETE',
           headers: {
diff --git a/ui/lib/actions.ts b/ui/lib/actions.ts
index 6b5c6bd..6b18603 100644
--- a/ui/lib/actions.ts
+++ b/ui/lib/actions.ts
@@ -1,10 +1,11 @@
 import { Message } from '@/components/ChatWindow';
+import process from 'process';
 
-export const getSuggestions = async (chatHisory: Message[], backendApiUrl: string) => {
+export const getSuggestions = async (chatHisory: Message[]) => {
   const chatModel = localStorage.getItem('chatModel');
   const chatModelProvider = localStorage.getItem('chatModelProvider');
 
-  const res = await fetch(`${backendApiUrl}/suggestions`, {
+  const res = await fetch(`${process.env.BACKEND_API_URL}/suggestions`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',