diff --git a/app/loading.tsx b/app/loading.tsx
deleted file mode 100644
index 74d85a3..0000000
--- a/app/loading.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import PageLoader from '@/components/common/PageLoader';
-
-export default function Loading() {
-    return <PageLoader />;
-}
diff --git a/components/ServiceWorkerRegister.tsx b/components/ServiceWorkerRegister.tsx
index efad040..8885b44 100644
--- a/components/ServiceWorkerRegister.tsx
+++ b/components/ServiceWorkerRegister.tsx
@@ -11,11 +11,10 @@ export default function ServiceWorkerRegister() {
         if (!('serviceWorker' in navigator)) return
 
         let refreshing = false
+        const hadController = !!navigator.serviceWorker.controller
 
-        // When a new worker takes control, reload once so the user gets the
-        // latest assets without a manual refresh.
         const onControllerChange = () => {
-            if (refreshing) return
+            if (!hadController || refreshing) return
             refreshing = true
             window.location.reload()
         }