diff --git a/frontend/src/components/MotdDisplay.tsx b/frontend/src/components/MotdDisplay.tsx
index 0ad45338..d5236d88 100644
--- a/frontend/src/components/MotdDisplay.tsx
+++ b/frontend/src/components/MotdDisplay.tsx
@@ -35,7 +35,7 @@ export function MotdDisplay() {
 
   async function fetchMotd() {
     const motd = await getMotd();
-    setMotd(motd);
+    motd && setMotd(motd);
   }
 
   useEffect(() => {