diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx
index 9b19a8f..8a72b0d 100644
--- a/src/frontend/src/App.tsx
+++ b/src/frontend/src/App.tsx
@@ -14,12 +14,11 @@ const App: React.FC = observer(() => {
 
   return (
     <>
-      <Toast ref={toast} />
-
       <ToastProvider value={toast.current}>
         <RouterProvider router={appRouter} />
       </ToastProvider>
 
+      <Toast ref={toast} />
       <ConfirmDialog />
       <ConfirmPopup />
     </>
diff --git a/src/frontend/src/utils/ToastContext.ts b/src/frontend/src/utils/ToastContext.ts
index 163753f..382a412 100644
--- a/src/frontend/src/utils/ToastContext.ts
+++ b/src/frontend/src/utils/ToastContext.ts
@@ -4,12 +4,4 @@ import { Toast } from 'primereact/toast';
 const ToastContext = createContext<Toast | null>(null);
 export const ToastProvider = ToastContext.Provider;
 
-export function useToast(): Toast {
-  const toast = useContext(ToastContext);
-
-  if (!toast) {
-    throw new Error('Toast not initialized!');
-  }
-
-  return toast;
-}
+export const useToast: (() => Toast) = () => useContext(ToastContext) as Toast;