diff --git a/src/portfolio/sections/Experience/helpers.ts b/src/portfolio/sections/Experience/helpers.ts
index c1daee4..5b68210 100644
--- a/src/portfolio/sections/Experience/helpers.ts
+++ b/src/portfolio/sections/Experience/helpers.ts
@@ -69,7 +69,10 @@ export const getCityGroups = (): ICityGroup[] => {
 		if (!cityJobsMap.has(normalizedCity)) {
 			cityJobsMap.set(normalizedCity, []);
 		}
-		cityJobsMap.get(normalizedCity)!.push(job);
+		const cityJobs = cityJobsMap.get(normalizedCity);
+		if (cityJobs) {
+			cityJobs.push(job);
+		}
 	});
 
 	const cityOrder = Array.from(cityJobsMap.entries())
@@ -79,9 +82,15 @@ export const getCityGroups = (): ICityGroup[] => {
 
 	const offsetPattern: ("left" | "right")[] = ["right", "left", "right", "left"];
 
-	return cityOrder.map((city, index) => createCityGroup(
-		city,
-		cityJobsMap.get(city)!,
-		offsetPattern[index % offsetPattern.length]
-	));
+	return cityOrder
+		.map((city, index) => {
+			const jobs = cityJobsMap.get(city);
+			if (!jobs) return null;
+			return createCityGroup(
+				city,
+				jobs,
+				offsetPattern[index % offsetPattern.length]
+			);
+		})
+		.filter((group): group is ICityGroup => group !== null);
 };