diff --git a/packages/admin-ui/src/pages/Customers/CustomerProfile.jsx b/packages/admin-ui/src/pages/Customers/CustomerProfile.jsx
index e98ca5f6..5a102a3b 100644
--- a/packages/admin-ui/src/pages/Customers/CustomerProfile.jsx
+++ b/packages/admin-ui/src/pages/Customers/CustomerProfile.jsx
@@ -285,7 +285,6 @@ const CHECK_AGAINST_SANCTIONS = gql`
 
 const CustomerProfile = memo(() => {
   const [, navigate] = useLocation()
-
   const [showCompliance, setShowCompliance] = useState(false)
   const [wizard, setWizard] = useState(false)
   const [error, setError] = useState(null)
@@ -298,6 +297,7 @@ const CustomerProfile = memo(() => {
     loading: customerLoading,
   } = useQuery(GET_CUSTOMER, {
     variables: { customerId },
+    skip: !customerId,
   })
 
   const { data: configResponse, loading: configLoading } = useQuery(GET_DATA)
diff --git a/packages/admin-ui/src/routing/routes.jsx b/packages/admin-ui/src/routing/routes.jsx
index 6448b03d..78395005 100644
--- a/packages/admin-ui/src/routing/routes.jsx
+++ b/packages/admin-ui/src/routing/routes.jsx
@@ -105,7 +105,10 @@ const Routes = () => {
           <Transition
             className={wrapperClasses}
             {...transitionProps}
-            in={location === route}
+            in={
+              location === route ||
+              (route.includes(':') && location.startsWith(route.split(':')[0]))
+            }
             mountOnEnter
             unmountOnExit>
             <div className={wrapperClasses}>