diff --git a/examples/android-material-ui/.storybook/main.js b/examples/android-material-ui/.storybook/main.js
index 122c5f0c..dd3d6d2c 100644
--- a/examples/android-material-ui/.storybook/main.js
+++ b/examples/android-material-ui/.storybook/main.js
@@ -1,10 +1,10 @@
-import { nativePreviewHead } from "@storybook/native/dist/previewHeader";
+import { nativePreviewHead } from "@storybook/native";
 
-const  config = {
+const config = {
     stories: ["../stories/*.stories.jsx"],
     framework: {
         name: "@storybook/react-webpack5",
-        options: {},
+        options: {}
     },
     addons: [
         "@storybook/addon-docs",
@@ -14,8 +14,7 @@ const  config = {
     docs: {
         autodocs: true
     },
-    previewHead: nativePreviewHead,
-
+    previewHead: nativePreviewHead
 };
 
 export default config;
diff --git a/examples/cross-platform/.storybook/main.js b/examples/cross-platform/.storybook/main.js
index 4bcac6d3..724e9760 100644
--- a/examples/cross-platform/.storybook/main.js
+++ b/examples/cross-platform/.storybook/main.js
@@ -1,8 +1,12 @@
-const  config = {
-    stories: [{ directory: '../src', files: '**/*.stories.@(mdx|tsx|ts|jsx|js)' }],
+import { nativePreviewHead } from "@storybook/native";
+
+const config = {
+    stories: [
+        { directory: "../src", files: "**/*.stories.@(mdx|tsx|ts|jsx|js)" }
+    ],
     framework: {
         name: "@storybook/react-webpack5",
-        options: {},
+        options: {}
     },
     addons: [
         "@storybook/addon-docs",
@@ -11,7 +15,8 @@ const  config = {
     ],
     docs: {
         autodocs: true
-    }
+    },
+    previewHead: nativePreviewHead
 };
 
 export default config;
diff --git a/examples/cross-platform/src/android.stories.jsx b/examples/cross-platform/src/android.stories.jsx
index 70402811..c7d65d3d 100644
--- a/examples/cross-platform/src/android.stories.jsx
+++ b/examples/cross-platform/src/android.stories.jsx
@@ -1,10 +1,10 @@
 import React from "react";
 import rgbHex from "rgb-hex";
-import { DeepLinkRenderer } from "@storybook/native-components";
+import { EmulatorRenderer } from "@storybook/native-components";
 
 const AndroidRenderer = ({ extraParams, component }) => {
     return (
-        <DeepLinkRenderer
+        <EmulatorRenderer
             apiKey="zv034bdme9je7c9d43chzmc2yg"
             platform="android"
             storyParams={{ component }}
diff --git a/examples/cross-platform/src/comparison.stories.jsx b/examples/cross-platform/src/comparison.stories.jsx
index d8739757..f21260fa 100644
--- a/examples/cross-platform/src/comparison.stories.jsx
+++ b/examples/cross-platform/src/comparison.stories.jsx
@@ -1,9 +1,9 @@
 import React from "react";
-import { DeepLinkRenderer } from "@storybook/native-components";
+import { EmulatorRenderer } from "@storybook/native-components";
 
 const AndroidRenderer = ({ extraParams, component }) => {
     return (
-        <DeepLinkRenderer
+        <EmulatorRenderer
             apiKey="zv034bdme9je7c9d43chzmc2yg"
             platform="android"
             storyParams={{ component }}
@@ -16,7 +16,7 @@ const AndroidRenderer = ({ extraParams, component }) => {
 
 const IosRenderer = ({ extraParams, component }) => {
     return (
-        <DeepLinkRenderer
+        <EmulatorRenderer
             apiKey="yc0e33432655wbjnnnemyghhxm"
             platform="ios"
             storyParams={{ component }}
diff --git a/examples/cross-platform/src/ios.stories.jsx b/examples/cross-platform/src/ios.stories.jsx
index 512fc6c0..fc056cb7 100644
--- a/examples/cross-platform/src/ios.stories.jsx
+++ b/examples/cross-platform/src/ios.stories.jsx
@@ -1,9 +1,9 @@
 import React from "react";
-import { DeepLinkRenderer } from "@storybook/native-components";
+import { EmulatorRenderer } from "@storybook/native-components";
 
 const IosRenderer = ({ extraParams, component }) => {
     return (
-        <DeepLinkRenderer
+        <EmulatorRenderer
             apiKey="yc0e33432655wbjnnnemyghhxm"
             platform="ios"
             storyParams={{ component }}
diff --git a/packages/addon/README.md b/packages/addon/README.md
index a92f6f50..a4ef60ea 100644
--- a/packages/addon/README.md
+++ b/packages/addon/README.md
@@ -28,7 +28,7 @@ it will make sure that the [Appetize SDK](https://docs.appetize.io/javascript-sd
 Update your `main.js` file with the following code:
 
 ```js
-import { nativePreviewHead } from "@storybook/native/dist/previewHeader";
+import { nativePreviewHead } from "@storybook/native";
 
 const  config = {
     stories: ["../stories/*.stories.jsx"],
diff --git a/packages/native-components/src/renderers/EmulatorRenderer.tsx b/packages/native-components/src/renderers/EmulatorRenderer.tsx
index 694331cd..f1c988eb 100644
--- a/packages/native-components/src/renderers/EmulatorRenderer.tsx
+++ b/packages/native-components/src/renderers/EmulatorRenderer.tsx
@@ -10,26 +10,46 @@ import {
     useAppDispatch
 } from "@storybook/native-controllers";
 import { useLogs, useNetworkLogs } from "@storybook/native-devices";
-import { RendererProps } from "../types";
+import { DeepLinkRendererProps } from "../types";
 import LaunchParamsRenderer from "./LaunchParamsRenderer";
 import DeepLinkRenderer from "./DeepLinkRenderer";
 
-const WithStore = (props: RendererProps): React.ReactElement => {
+const appetizeSessionMap = new Map<string, Session>();
+
+const WithStore = (props: DeepLinkRendererProps): React.ReactElement => {
     const dispatch = useAppDispatch();
     const networkLogs = useNetworkLogs();
     const logs = useLogs();
 
     const [session, setSession] = React.useState<Session>();
 
+    const sessionKey = props.context ?? props.platform;
     useEffect(() => {
         if (!window.appetize) {
             addons.getChannel().emit(EmulatorEvents.onMissingClient, null);
             return;
         }
-        window.appetize.getClient("#appetize-iframe").then((client: Client) => {
+
+        if (sessionKey && appetizeSessionMap.has(sessionKey)) {
+            setSession(appetizeSessionMap.get(sessionKey));
+            resetNetworkLogs(dispatch);
+            addons.getChannel().emit(EmulatorEvents.onRestNetworkLogs);
+            return;
+        }
+
+        const frameId = `#appetize-iframe${
+            props.context ? `-${props.context}` : ""
+        }`;
+        window.appetize.getClient(frameId).then((client: Client) => {
             addons.getChannel().emit(EmulatorEvents.onClient, client);
 
+            client.on("error", (error: string) => {
+                console.error(error);
+                appetizeSessionMap.delete(sessionKey);
+            });
+
             client.on("session", (newSession: Session) => {
+                if (sessionKey) appetizeSessionMap.set(sessionKey, newSession);
                 setSession(newSession);
                 resetNetworkLogs(dispatch);
                 addons.getChannel().emit(EmulatorEvents.onRestNetworkLogs);
@@ -52,7 +72,7 @@ const WithStore = (props: RendererProps): React.ReactElement => {
                 addons.getChannel().emit(EmulatorEvents.onSession, session);
             });
         });
-    }, [networkLogs, logs]);
+    }, [networkLogs, logs, props.context]);
 
     return (
         <>
@@ -64,7 +84,7 @@ const WithStore = (props: RendererProps): React.ReactElement => {
     );
 };
 
-export default (props: RendererProps): React.ReactElement => {
+export default (props: DeepLinkRendererProps): React.ReactElement => {
     return (
         <Provider store={store}>
             <WithStore {...props} />