diff --git a/Frontend/lib/main.dart b/Frontend/lib/main.dart
index 4bdbd191..c519fbb4 100644
--- a/Frontend/lib/main.dart
+++ b/Frontend/lib/main.dart
@@ -74,9 +74,16 @@ class _MzansiInnovationHubState extends State<MzansiInnovationHub> {
       debugShowCheckedModeBanner: false,
       routerConfig: widget.router,
       builder: (context, child) {
+        if (child == null) {
+          return const Scaffold(
+            body: Center(
+              child: CircularProgressIndicator(),
+            ),
+          );
+        }
         return UpgradeAlert(
           navigatorKey: widget.router.routerDelegate.navigatorKey,
-          child: child ?? const Text('Upgrade Alert'),
+          child: child,
         );
       },
     );