diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index 99032fc..b2fe424 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -1218,6 +1218,10 @@ export default class RoomClient
 
 				([ track ] = stream.getAudioTracks());
 
+				const { deviceId: trackDeviceId } = track.getSettings();
+
+				store.dispatch(settingsActions.setSelectedAudioDevice(trackDeviceId));
+
 				this._micProducer = await this._sendTransport.produce(
 					{
 						track,
@@ -1386,6 +1390,10 @@ export default class RoomClient
 
 				([ track ] = stream.getVideoTracks());
 
+				const { deviceId: trackDeviceId } = track.getSettings();
+
+				store.dispatch(settingsActions.setSelectedWebcamDevice(trackDeviceId));
+
 				if (this._useSimulcast)
 				{
 					// If VP9 is the only available video codec then use SVC.