diff --git a/package.json b/package.json
index 1555b7bf..df74b20e 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "i18next": "^21.10.0",
     "i18next-browser-languagedetector": "^6.1.8",
     "i18next-http-backend": "^1.4.4",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#3e2207601c375b9d793106c743fdfaf2e4184988",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#278dd6a3d35cf89c03f9172f9c81579577a267b3",
     "matrix-widget-api": "^1.0.0",
     "mermaid": "^8.13.8",
     "normalize.css": "^8.0.1",
diff --git a/src/room/InCallView.tsx b/src/room/InCallView.tsx
index 22145012..c952110f 100644
--- a/src/room/InCallView.tsx
+++ b/src/room/InCallView.tsx
@@ -227,7 +227,7 @@ export function InCallView({
       // shouldn't bother showing it
       if (connectionState !== undefined) {
         tileDescriptors.push({
-          id: screenshareFeed.stream.id,
+          id: screenshareFeed.feedId,
           member,
           callFeed: screenshareFeed,
           focused: true,
diff --git a/src/video-grid/VideoTileContainer.tsx b/src/video-grid/VideoTileContainer.tsx
index 1741ca85..14d346a6 100644
--- a/src/video-grid/VideoTileContainer.tsx
+++ b/src/video-grid/VideoTileContainer.tsx
@@ -16,7 +16,7 @@ limitations under the License.
 
 import { SDPStreamMetadataPurpose } from "matrix-js-sdk/src/webrtc/callEventTypes";
 import React from "react";
-import { useCallback } from "react";
+import { useCallback, useEffect } from "react";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 
 import { useCallFeed } from "./useCallFeed";
@@ -95,6 +95,14 @@ export function VideoTileContainer({
   // Firefox doesn't respect the disablePictureInPicture attribute
   // https://bugzilla.mozilla.org/show_bug.cgi?id=1611831
 
+  useEffect(() => {
+    item.callFeed?.setResolution(width, height);
+  }, [width, height, item.callFeed]);
+
+  useEffect(() => {
+    item.callFeed?.setIsVisible(true);
+  }, [item.callFeed]);
+
   return (
     <>
       <VideoTile
diff --git a/src/video-grid/useCallFeed.ts b/src/video-grid/useCallFeed.ts
index 35bf8e58..e29bfac4 100644
--- a/src/video-grid/useCallFeed.ts
+++ b/src/video-grid/useCallFeed.ts
@@ -39,7 +39,10 @@ function getCallFeedState(callFeed: CallFeed | undefined): CallFeedState {
     videoMuted: callFeed ? callFeed.isVideoMuted() : true,
     audioMuted: callFeed ? callFeed.isAudioMuted() : true,
     localVolume: callFeed ? callFeed.getLocalVolume() : 0,
-    hasAudio: callFeed ? callFeed.stream.getAudioTracks().length >= 1 : false,
+    hasAudio:
+      callFeed && callFeed.stream
+        ? callFeed.stream.getAudioTracks().length >= 1
+        : false,
     disposed: callFeed ? callFeed.disposed : undefined,
     stream: callFeed ? callFeed.stream : undefined,
     purpose: callFeed ? callFeed.purpose : undefined,
diff --git a/yarn.lock b/yarn.lock
index fc137bde..423861a2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10362,9 +10362,9 @@ matrix-events-sdk@0.0.1:
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#3e2207601c375b9d793106c743fdfaf2e4184988":
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#278dd6a3d35cf89c03f9172f9c81579577a267b3":
   version "23.0.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/3e2207601c375b9d793106c743fdfaf2e4184988"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/278dd6a3d35cf89c03f9172f9c81579577a267b3"
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.2"