diff --git a/src/layout/ChatLayout/ChatLayout.tsx b/src/layout/ChatLayout/ChatLayout.tsx
index d4b1388..ec3f046 100644
--- a/src/layout/ChatLayout/ChatLayout.tsx
+++ b/src/layout/ChatLayout/ChatLayout.tsx
@@ -83,12 +83,12 @@ export function ChatLayout<PropFormat>({
           <div className={styles.Main_List}>
             {props?.users.map((user) => (<Link 
               href={`/jams/user/${user?.id}`}
-              className={props.whoami?.id === user.id ? styles.Main_List_CurrentLink : ""}
-              title={`${user.username}@${user.instance}`}
+              className={props.whoami?.id === user?.id ? styles.Main_List_CurrentLink : ""}
+              title={`${user?.username}@${user?.instance}`}
             >
               <div className={`fw ${styles.Main_List_Button}`}>
                   <span className="icon">person</span>
-                  <span>{user.username}@{user.instance}</span>
+                  <span>{user?.username}@{user?.instance}</span>
               </div>
             </Link>))}
           </div>