diff --git a/change-beta/@azure-communication-react-d6a2c723-a4e8-48db-9ce4-a26c89fa019b.json b/change-beta/@azure-communication-react-d6a2c723-a4e8-48db-9ce4-a26c89fa019b.json
new file mode 100644
index 00000000000..629cee79dff
--- /dev/null
+++ b/change-beta/@azure-communication-react-d6a2c723-a4e8-48db-9ce4-a26c89fa019b.json
@@ -0,0 +1,9 @@
+{
+ "type": "patch",
+ "area": "fix",
+ "workstream": "",
+ "comment": "Fix crash bug for remote screen share",
+ "packageName": "@azure/communication-react",
+ "email": "jiangnanhello@live.com",
+ "dependentChangeType": "patch"
+}
diff --git a/change/@azure-communication-react-d6a2c723-a4e8-48db-9ce4-a26c89fa019b.json b/change/@azure-communication-react-d6a2c723-a4e8-48db-9ce4-a26c89fa019b.json
new file mode 100644
index 00000000000..629cee79dff
--- /dev/null
+++ b/change/@azure-communication-react-d6a2c723-a4e8-48db-9ce4-a26c89fa019b.json
@@ -0,0 +1,9 @@
+{
+ "type": "patch",
+ "area": "fix",
+ "workstream": "",
+ "comment": "Fix crash bug for remote screen share",
+ "packageName": "@azure/communication-react",
+ "email": "jiangnanhello@live.com",
+ "dependentChangeType": "patch"
+}
diff --git a/packages/react-components/src/components/RemoteVideoTile.tsx b/packages/react-components/src/components/RemoteVideoTile.tsx
index 0d9cfc4eb4e..edacbaf9ee1 100644
--- a/packages/react-components/src/components/RemoteVideoTile.tsx
+++ b/packages/react-components/src/components/RemoteVideoTile.tsx
@@ -203,11 +203,11 @@ export const _RemoteVideoTile = React.memo(
return remoteParticipant.displayName;
};
- const reactionOverlay = (
+ const reactionOverlay = reactionResources && (
);
diff --git a/packages/react-components/src/components/VideoGallery/RemoteScreenShare.tsx b/packages/react-components/src/components/VideoGallery/RemoteScreenShare.tsx
index 3e806e7a05e..c300793da50 100644
--- a/packages/react-components/src/components/VideoGallery/RemoteScreenShare.tsx
+++ b/packages/react-components/src/components/VideoGallery/RemoteScreenShare.tsx
@@ -93,12 +93,14 @@ export const RemoteScreenShare = React.memo(
}
onRenderPlaceholder={() => }
overlay={
-
+ reactionResources && (
+
+ )
}
/>
);
@@ -115,12 +117,14 @@ export const RemoteScreenShare = React.memo(
}
onRenderPlaceholder={() => }
overlay={
-
+ reactionResources && (
+
+ )
}
/>
);