diff --git a/src/components/app/Homeworks/Notebook.jsx b/src/components/app/Homeworks/Notebook.jsx
index 2d6c9c3..9eed323 100644
--- a/src/components/app/Homeworks/Notebook.jsx
+++ b/src/components/app/Homeworks/Notebook.jsx
@@ -71,7 +71,7 @@ export default function Notebook({ hideDateController = false }) {
          * @param dir Direction in time to check : 1 to move forward ; -1 to move backwards
          */
         if (!homeworks) {
-            return;
+            return getISODate(new Date());
         }
 
         const dates = Object.keys(homeworks).filter(e => homeworks[e].length);
diff --git a/src/components/app/Messaging/Inbox.jsx b/src/components/app/Messaging/Inbox.jsx
index 160e202..f1b175a 100644
--- a/src/components/app/Messaging/Inbox.jsx
+++ b/src/components/app/Messaging/Inbox.jsx
@@ -90,7 +90,7 @@ export default function Inbox({ selectedMessage, setSelectedMessage, fetchMessag
                             </li>)}
                         </ul>
                     </ScrollShadedDiv>
-                    : <p className="no-message-received">Vous n'avez reçu aucun message. Profitez bien de votre isolement social ^^</p>
+                    : <p className="no-message-received">Vous n'avez reçu aucun message. Tendez l'oreille et profitez de cet instant de silence</p>
                 )
                 : <ScrollShadedDiv className="messages-container">
                     <ul>