diff --git a/frontend/src/modules/AppWrapper.tsx b/frontend/src/modules/AppWrapper.tsx
index 11e53cd04d..26741a2f9b 100644
--- a/frontend/src/modules/AppWrapper.tsx
+++ b/frontend/src/modules/AppWrapper.tsx
@@ -33,34 +33,40 @@ const App = () => {
 					<Switch>
 						<RouteProvider>
 							<BaseLayout>
-								<Route path={ROUTES.SIGN_UP} exact component={Signup} />
-								<Route path={ROUTES.APPLICATION} exact component={ServicesTable} />
-								<Route path={ROUTES.SERVICE_METRICS} exact component={ServiceMetrics} />
-								<Route path={ROUTES.SERVICE_MAP} exact component={ServiceMap} />
-								<Route path={ROUTES.TRACES} exact component={TraceDetail} />
-								<Route path={ROUTES.TRACE_GRAPH} exact component={TraceGraph} />
-								<Route path={ROUTES.SETTINGS} exact component={SettingsPage} />
-								<Route
-									path={ROUTES.INSTRUMENTATION}
-									exact
-									component={IntstrumentationPage}
-								/>
-								<Route
-									path={ROUTES.USAGE_EXPLORER}
-									exactexact
-									component={UsageExplorer}
-								/>
-								<Route
-									path="/"
-									exact
-									render={() => {
-										return localStorage.getItem(IS_LOGGED_IN) === "yes" ? (
-											<Redirect to={ROUTES.APPLICATION} />
-										) : (
-											<Redirect to={ROUTES.SIGN_UP} />
-										);
-									}}
-								/>
+								<Suspense fallback={<Spin size="large" />}>
+									<Route path={ROUTES.SIGN_UP} exact component={Signup} />
+									<Route path={ROUTES.APPLICATION} exact component={ServicesTable} />
+									<Route
+										path={ROUTES.SERVICE_METRICS}
+										exact
+										component={ServiceMetrics}
+									/>
+									<Route path={ROUTES.SERVICE_MAP} exact component={ServiceMap} />
+									<Route path={ROUTES.TRACES} exact component={TraceDetail} />
+									<Route path={ROUTES.TRACE_GRAPH} exact component={TraceGraph} />
+									<Route path={ROUTES.SETTINGS} exact component={SettingsPage} />
+									<Route
+										path={ROUTES.INSTRUMENTATION}
+										exact
+										component={IntstrumentationPage}
+									/>
+									<Route
+										path={ROUTES.USAGE_EXPLORER}
+										exactexact
+										component={UsageExplorer}
+									/>
+									<Route
+										path="/"
+										exact
+										render={() => {
+											return localStorage.getItem(IS_LOGGED_IN) === "yes" ? (
+												<Redirect to={ROUTES.APPLICATION} />
+											) : (
+												<Redirect to={ROUTES.SIGN_UP} />
+											);
+										}}
+									/>
+								</Suspense>
 							</BaseLayout>
 						</RouteProvider>
 					</Switch>