diff --git a/apps/storefront/src/pages/order/Order.tsx b/apps/storefront/src/pages/order/Order.tsx
index b5beb80c..9e67bd4f 100644
--- a/apps/storefront/src/pages/order/Order.tsx
+++ b/apps/storefront/src/pages/order/Order.tsx
@@ -105,6 +105,8 @@ function Order({ isCompanyOrder = false }: OrderProps) {
   useEffect(() => {
     const search = getInitFilter(isCompanyOrder, isB2BUser)
     setFilterData(search)
+    if (role === 100) return
+
     const initFilter = async () => {
       const companyId = companyB2BId || salesRepCompanyId
       let createdByUsers: CustomFieldItems = {}
diff --git a/packages/hooks/useB3AppOpen.ts b/packages/hooks/useB3AppOpen.ts
index 7f539689..23dba48e 100644
--- a/packages/hooks/useB3AppOpen.ts
+++ b/packages/hooks/useB3AppOpen.ts
@@ -31,10 +31,10 @@ export const useB3AppOpen = (initOpenState: OpenPageState) => {
 
   const getCurrentLoginUrl = (href: string): string => {
     let url = '/login'
-    if (href.includes('logout')) {
+    if (href?.includes('logout')) {
       url = '/login?loginFlag=3'
     }
-    if (href.includes('create_account')) {
+    if (href?.includes('create_account')) {
       url = '/registered'
     }
 
@@ -83,7 +83,7 @@ export const useB3AppOpen = (initOpenState: OpenPageState) => {
       window.b2bStorefrontApp.isInit = true
 
       window.addEventListener('click', handleTriggerClick, {
-        capture: false,
+        capture: true,
       })
       return () => {
         window.removeEventListener('click', handleTriggerClick)