diff --git a/web/src/app/submissions/page.tsx b/web/src/app/submissions/page.tsx
index 154c368..2b803a7 100644
--- a/web/src/app/submissions/page.tsx
+++ b/web/src/app/submissions/page.tsx
@@ -44,10 +44,18 @@ export default function SubmissionInfoPage() {
 		}, 50);
 	}, [])
 
-	if (!submissions || submissions.length == 0) {
+	if (!submissions) {
 		return <Webpage>
 			<main>
-				 Loading...
+				Loading...
+			</main>
+		</Webpage>
+	}
+
+	if (submissions && submissions.length == 0) {
+		return <Webpage>
+			<main>
+				Submissions list is empty.
 			</main>
 		</Webpage>
 	}
@@ -99,4 +107,4 @@ export default function SubmissionInfoPage() {
 			</main>
 		</Webpage>
 	)
-}
\ No newline at end of file
+}