diff --git a/src/pages/homepage/Homepage.tsx b/src/pages/homepage/Homepage.tsx
index b2de6b7..66786e5 100644
--- a/src/pages/homepage/Homepage.tsx
+++ b/src/pages/homepage/Homepage.tsx
@@ -39,7 +39,7 @@ export function Homepage() {
 	} = useCommonHooks();
 	const [personal, setPersonal] = useState<PersonalData>();
 	const [message, setMessage] = useState<Message>();
-	const [displayedGreeting, setDisplayedGreeting] = useState('');
+	const [displayedGreeting, setDisplayedGreeting] = useState<string | undefined>('');
 	const [weatherModalOpened, { open: openWeatherModal, close: closeWeatherModal }] =
 		useDisclosure(false);
 	const dateOptions: Intl.DateTimeFormatOptions = !isMobile
@@ -63,7 +63,7 @@ export function Homepage() {
 		}
 	}, [personalData, personalIsFetched]);
 	useEffect(() => {
-		if (message !== undefined && personal) {
+		if (personal) {
 			setDisplayedGreeting(() => {
 				if (Math.floor(Math.random() * 100) > 10 || message === undefined) {
 					switch (Math.floor(new Date().getHours() / 6)) {
@@ -77,7 +77,7 @@ export function Homepage() {
 							return `Good evening, ${personal?.firstName}!`;
 					}
 				}
-				return message.message;
+				return message?.message;
 			});
 		}
 	}, [message, personal, isMessagesFetching]);
diff --git a/src/pages/homepage/components/Header/Header.tsx b/src/pages/homepage/components/Header/Header.tsx
index b0d2bc2..200052d 100644
--- a/src/pages/homepage/components/Header/Header.tsx
+++ b/src/pages/homepage/components/Header/Header.tsx
@@ -13,7 +13,7 @@ function Header({
 	basicWeather,
 	openWeatherModal,
 }: {
-	greet: string;
+	greet: string | undefined;
 	date: string;
 	current: CurrentWeather;
 	setCurrent: (current: CurrentWeather) => void;
diff --git a/src/pages/homepage/components/Header/LargeHeader.tsx b/src/pages/homepage/components/Header/LargeHeader.tsx
index 542a982..76dca07 100644
--- a/src/pages/homepage/components/Header/LargeHeader.tsx
+++ b/src/pages/homepage/components/Header/LargeHeader.tsx
@@ -11,7 +11,7 @@ function LargeHeader({
 	weather,
 	basicWeather,
 }: {
-	greet: string;
+	greet: string | undefined;
 	date: string;
 	weather: any;
 	basicWeather: any;
@@ -73,7 +73,7 @@ function LargeHeader({
 				fz={isMobile ? '2rem' : '6rem'}
 			>
 				{greet
-					.replace('$firstName', currentUser.firstName)
+					?.replace('$firstName', currentUser.firstName)
 					.replace('$lastName', currentUser.lastName)
 					.replace('$^firstName', currentUser.firstName.toUpperCase())
 					.replace('$^lastName', currentUser.lastName.toUpperCase())}