diff --git a/packages/app/src/main.tsx b/packages/app/src/main.tsx
index df8b1e8..5c0a9ff 100644
--- a/packages/app/src/main.tsx
+++ b/packages/app/src/main.tsx
@@ -3,7 +3,8 @@ import {
   ErrorBoundary,
   MetaTags,
   TokenProvider,
-  createApp
+  createApp,
+  type ClAppProps
 } from '@commercelayer/app-elements'
 import '@commercelayer/app-elements/style.css'
 import { StrictMode } from 'react'
@@ -12,31 +13,32 @@ import { App } from './App'
 
 const isDev = Boolean(import.meta.env.DEV)
 
-createApp(
-  (props) => (
-    <StrictMode>
-      <ErrorBoundary hasContainer>
-        <SWRConfig
-          value={{
-            revalidateOnFocus: false
-          }}
+const Main: React.FC<ClAppProps> = (props) => (
+  <StrictMode>
+    <ErrorBoundary hasContainer>
+      <SWRConfig
+        value={{
+          revalidateOnFocus: false
+        }}
+      >
+        <TokenProvider
+          kind='shipments'
+          appSlug='shipments'
+          devMode={isDev}
+          reauthenticateOnInvalidAuth={!isDev && props?.onInvalidAuth == null}
+          loadingElement={<div />}
+          {...props}
         >
-          <TokenProvider
-            kind='shipments'
-            appSlug='shipments'
-            devMode={isDev}
-            reauthenticateOnInvalidAuth={!isDev && props?.onInvalidAuth == null}
-            loadingElement={<div />}
-            {...props}
-          >
-            <CoreSdkProvider>
-              <MetaTags />
-              <App routerBase={props?.routerBase} />
-            </CoreSdkProvider>
-          </TokenProvider>
-        </SWRConfig>
-      </ErrorBoundary>
-    </StrictMode>
-  ),
-  'shipments'
+          <CoreSdkProvider>
+            <MetaTags />
+            <App routerBase={props?.routerBase} />
+          </CoreSdkProvider>
+        </TokenProvider>
+      </SWRConfig>
+    </ErrorBoundary>
+  </StrictMode>
 )
+
+export default Main
+
+createApp(Main, 'shipments')