diff --git a/client/src/App.jsx b/client/src/App.jsx
index 7e9d7b51..ad4adc5e 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -146,13 +146,17 @@ function App() {
             <Route
               path="/patients/register/:patientId"
               element={
-                <ProtectedRoute
-                  role={user?.role}
-                  restrictedRoles={['FIRST_RESPONDER']}
-                  message={'Patient does not exist.'}
-                >
-                  <PatientRegistration />
-                </ProtectedRoute>
+                user ? (
+                  <ProtectedRoute
+                    role={user?.role}
+                    restrictedRoles={['FIRST_RESPONDER']}
+                    message={'Patient does not exist.'}
+                  >
+                    <PatientRegistration />
+                  </ProtectedRoute>
+                ) : (
+                  <Loader />
+                )
               }
             />
 
diff --git a/client/src/stories/Header/Header.jsx b/client/src/stories/Header/Header.jsx
index ab8283d0..8d7a8b1b 100644
--- a/client/src/stories/Header/Header.jsx
+++ b/client/src/stories/Header/Header.jsx
@@ -18,7 +18,7 @@ import { Sidebar } from '../../components/Sidebar/Sidebar';
  * Buttons for logged out buttons
  * @param {PropTypes.InferProps<typeof headerProps>} props
  */
-export function Header({ user }) {
+export function Header({ user = null }) {
   const [drawerOpened, { toggle: toggleDrawer, close: closeDrawer }] =
     useDisclosure(false);
 
@@ -74,9 +74,6 @@ const headerProps = {
 };
 
 Header.propTypes = headerProps;
-Header.defaultProps = {
-  user: null,
-};
 
 const loggedOutButtonsProps = {};