diff --git a/src/components/SettingsModal/SettingsModal.jsx b/src/components/SettingsModal/SettingsModal.jsx
index e39c64d..dee82e7 100644
--- a/src/components/SettingsModal/SettingsModal.jsx
+++ b/src/components/SettingsModal/SettingsModal.jsx
@@ -14,9 +14,9 @@ export default function SettingsModal() {
 
     const [open, setOpen] = useState(false);
 
-    const [name, setName] = useState(user.name);
-    const [lastname, setLastName] = useState(user.lastname);
-    const [phone, setPhone] = useState(user.phone);
+    const [name, setName] = useState(user?.name);
+    const [lastname, setLastName] = useState(user?.lastname);
+    const [phone, setPhone] = useState(user?.phone);
 
     const handleLogout = () => {
         logout();
diff --git a/src/pages/Profile/ProfilePage.jsx b/src/pages/Profile/ProfilePage.jsx
index a47e87c..f2c54dd 100644
--- a/src/pages/Profile/ProfilePage.jsx
+++ b/src/pages/Profile/ProfilePage.jsx
@@ -8,6 +8,7 @@ import SettingsModal from "../../components/SettingsModal/SettingsModal.jsx";
 function ProfilePage() {
 
     const { user } = useContext(AuthContext);
+
   return (
     <div className={styles.container}>
       <div className={`${styles.profileboard} glassCard`}>
@@ -21,22 +22,22 @@ function ProfilePage() {
           </div>
           <div className={styles.description}>
             <div className={styles.headerProfile}>
-                <h2> {user.name} {user.lastname} </h2>
+                <h2> {user?.name} {user?.lastname} </h2>
             </div>
             <div className={styles.topDescription}>
               <div className={styles.infoBlock}>
-                <p><strong>Role :</strong> {user.role}</p>
-                <p><strong>Membre depuis :</strong> {formatDate(user.created_at)}</p>
+                <p><strong>Role :</strong> {user?.role}</p>
+                <p><strong>Membre depuis :</strong> {user && formatDate(user.created_at)}</p>
               </div>
               <div className={styles.infoBlock}>
-                <p><strong>Mail :</strong> {user.email} </p>
-                <p><strong>Téléphone :</strong> {user.phone === null ? "Pas de numéro enregistré" : user.phone}</p>
+                <p><strong>Mail :</strong> {user?.email} </p>
+                <p><strong>Téléphone :</strong> {user?.phone === null ? "Pas de numéro enregistré" : user?.phone}</p>
               </div>
                 <SettingsModal />
             </div>
 
             <h2>Tâches :</h2>
-              {user.tasks && user.tasks.length > 0 ? (
+              {user && user.tasks.length > 0 ? (
                   user.tasks.map((task, index) => (
                       <Task key={index} task={task} />
                   ))