diff --git a/src/containers/flight/OperationApprovalsContainer.js b/src/containers/flight/OperationApprovalsContainer.js
index 8a8329e9..0574427d 100644
--- a/src/containers/flight/OperationApprovalsContainer.js
+++ b/src/containers/flight/OperationApprovalsContainer.js
@@ -130,6 +130,7 @@ export default function OperationApprovalsContainer({ mode }) {
                 targetValue: features.properties.key
               }
             });
+
             return;
           }
           setSelected([features.properties.key]);
@@ -187,6 +188,7 @@ export default function OperationApprovalsContainer({ mode }) {
             return;
           case 'closedSync':
             popupRef.current.close();
+            popupRef.current = null;
             // localStorage.removeItem('popupState');
             return;
           default:
@@ -203,6 +205,7 @@ export default function OperationApprovalsContainer({ mode }) {
       timer = setInterval(() => {
         if (popup.closed) {
           setIsPopup(false);
+          popupRef.current = null;
           clearInterval(timer);
         }
 
@@ -215,6 +218,7 @@ export default function OperationApprovalsContainer({ mode }) {
 
           if (popupX >= parentX && popupX <= parentX + parentWidth) {
             popup.close();
+            popupRef.current = null;
             setIsPopup(false);
             clearInterval(timer);
           }
@@ -235,6 +239,7 @@ export default function OperationApprovalsContainer({ mode }) {
 
       if (popupRef.current) {
         popupRef.current.close();
+        popupRef.current = null;
       }
     };
 
diff --git a/src/router/hoc/ResolveRoutes.tsx b/src/router/hoc/ResolveRoutes.tsx
index a320463d..ce238d5c 100644
--- a/src/router/hoc/ResolveRoutes.tsx
+++ b/src/router/hoc/ResolveRoutes.tsx
@@ -38,12 +38,16 @@ export default function ResolveRoutes() {
     if (decodeToken) {
       if (decodeToken.userId === 'palnet') {
         Router = [...Routes, ...GimpoControlRoutes];
-      } else if (decodeToken.cptAuthCode.includes('DF0002')) {
-        Router = GimpoControlRoutes.filter(
-          i =>
-            i.meta.cptAuthCode === 'All' ||
-            i.meta.cptAuthCode === decodeToken.cptAuthCode
-        );
+      } else {
+        if (decodeToken.cptAuthCode) {
+          if (decodeToken.cptAuthCode.includes('DF0002')) {
+            Router = GimpoControlRoutes.filter(
+              i =>
+                i.meta.cptAuthCode === 'All' ||
+                i.meta.cptAuthCode === decodeToken.cptAuthCode
+            );
+          }
+        }
       }
     }