diff --git a/src/CallHandler.tsx b/src/CallHandler.tsx
index e9ccd6ef20..804c6a6699 100644
--- a/src/CallHandler.tsx
+++ b/src/CallHandler.tsx
@@ -513,8 +513,8 @@ export default class CallHandler {
             call.placeScreenSharingCall(
                 remoteElement,
                 localElement,
-                async (sources: Array<DesktopCapturerSource>) : Promise<DesktopCapturerSource> => {
-                    const {finished} = Modal.createDialog(DesktopCapturerSourcePicker, {sources});
+                async () : Promise<DesktopCapturerSource> => {
+                    const {finished} = Modal.createDialog(DesktopCapturerSourcePicker);
                     const [source] = await finished;
                     return source;
                 });
diff --git a/src/components/views/elements/DesktopCapturerSourcePicker.tsx b/src/components/views/elements/DesktopCapturerSourcePicker.tsx
index b04b50ca99..70c5fbaa8d 100644
--- a/src/components/views/elements/DesktopCapturerSourcePicker.tsx
+++ b/src/components/views/elements/DesktopCapturerSourcePicker.tsx
@@ -18,6 +18,7 @@ import React from 'react';
 import { _t } from '../../../languageHandler';
 import BaseDialog from "..//dialogs/BaseDialog"
 import AccessibleButton from './AccessibleButton';
+import {getDesktopCapturerSources} from "matrix-js-sdk/src/webrtc/call";
 
 export enum Tabs {
     Screens = "screens",
@@ -56,24 +57,37 @@ export class ExistingSource extends React.Component<DesktopCapturerSourceIProps>
 
 export interface DesktopCapturerSourcePickerIState {
     selectedTab: Tabs;
+    sources: Array<DesktopCapturerSource>;
 }
 export interface DesktopCapturerSourcePickerIProps {
-    sources: Array<DesktopCapturerSource>;
     onFinished(source: DesktopCapturerSource): void;
 }
 
-// TODO: Figure out a way to update sources for live preview
-
 export default class DesktopCapturerSourcePicker extends React.Component<
     DesktopCapturerSourcePickerIProps,
     DesktopCapturerSourcePickerIState
     > {
+    interval;
+
     constructor(props) {
         super(props);
 
         this.state = {
             selectedTab: Tabs.Screens,
-        }
+            sources: [],
+        };
+    }
+
+    componentDidMount() {
+        this.interval = setInterval(async () => {
+            this.setState({
+                sources: await getDesktopCapturerSources(),
+            });
+        }, 500);
+    }
+
+    componentWillUnmount() {
+        clearInterval(this.interval);
     }
 
     onSelect = (source) => {
@@ -95,7 +109,7 @@ export default class DesktopCapturerSourcePicker extends React.Component<
     render() {
         let sources;
         if (this.state.selectedTab === Tabs.Screens) {
-            sources = this.props.sources
+            sources = this.state.sources
                 .filter((source) => {
                     return source.id.startsWith("screen");
                 })
@@ -103,7 +117,7 @@ export default class DesktopCapturerSourcePicker extends React.Component<
                     return <ExistingSource source={source} onSelect={this.onSelect} key={source.id} />;
                 });
         } else {
-            sources = this.props.sources
+            sources = this.state.sources
                 .filter((source) => {
                     return source.id.startsWith("window");
                 })