diff --git a/app/.env b/app/.env
new file mode 100644
index 0000000..86c714e
--- /dev/null
+++ b/app/.env
@@ -0,0 +1,2 @@
+REACT_APP_VERSION=$npm_package_version
+REACT_APP_NAME=$npm_package_name
\ No newline at end of file
diff --git a/app/public/config/config.example.js b/app/public/config/config.example.js
index 4c7f249..bbd9a03 100644
--- a/app/public/config/config.example.js
+++ b/app/public/config/config.example.js
@@ -37,20 +37,22 @@ var config =
 		'opera'
 	],
 	// Socket.io request timeout
-	requestTimeout   : 10000,
+	requestTimeout   : 20000,
+	requestRetries   : 3,
 	transportOptions :
 	{
 		tcp : true
 	},
 	defaultAudio : 
 	{
-		sampleRate       : 48000,
-		channelCount     : 1,
-		volume           : 1.0,
-		autoGainControl  : true,
-		echoCancellation : true,
-		noiseSuppression : true,
-		sampleSize       : 16
+		sampleRate        : 48000,
+		channelCount      : 1,
+		volume            : 1.0,
+		autoGainControl   : true,
+		echoCancellation  : true,
+		noiseSuppression  : true,
+		voiceActivityMute : false,
+		sampleSize        : 16
 	},
 
 	/**
diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index a936a14..7d7336c 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -1,6 +1,7 @@
 import Logger from './Logger';
 import hark from 'hark';
 import { getSignalingUrl } from './urlFactory';
+import { SocketTimeoutError } from './utils';
 import * as requestActions from './actions/requestActions';
 import * as meActions from './actions/meActions';
 import * as roomActions from './actions/roomActions';
@@ -314,7 +315,7 @@ export default class RoomClient
 					{
 						const newPeerId = this._spotlights.getNextAsSelected(
 							store.getState().room.selectedPeerId);
-							
+
 						if (newPeerId) this.setSelectedPeer(newPeerId);
 						break;
 					}
@@ -574,7 +575,7 @@ export default class RoomClient
 				if (called)
 					return;
 				called = true;
-				callback(new Error('Request timeout.'));
+				callback(new SocketTimeoutError('Request timed out'));
 			},
 			ROOM_OPTIONS.requestTimeout
 		);
@@ -590,13 +591,13 @@ export default class RoomClient
 		};
 	}
 
-	sendRequest(method, data)
+	_sendRequest(method, data)
 	{
 		return new Promise((resolve, reject) =>
 		{
 			if (!this._signalingSocket)
 			{
-				reject('No socket connection.');
+				reject('No socket connection');
 			}
 			else
 			{
@@ -606,19 +607,42 @@ export default class RoomClient
 					this.timeoutCallback((err, response) =>
 					{
 						if (err)
-						{
 							reject(err);
-						}
 						else
-						{
 							resolve(response);
-						}
 					})
 				);
 			}
 		});
 	}
 
+	async sendRequest(method, data)
+	{
+		logger.debug('sendRequest() [method:"%s", data:"%o"]', method, data);
+
+		const {
+			requestRetries = 3
+		} = window.config;
+
+		for (let tries = 0; tries < requestRetries; tries++)
+		{
+			try
+			{
+				return await this._sendRequest(method, data);
+			}
+			catch (error)
+			{
+				if (
+					error instanceof SocketTimeoutError &&
+					tries < requestRetries
+				)
+					logger.warn('sendRequest() | timeout, retrying [attempt:"%s"]', tries);
+				else
+					throw error;
+			}
+		}
+	}
+
 	async changeDisplayName(displayName)
 	{
 		logger.debug('changeDisplayName() [displayName:"%s"]', displayName);
@@ -774,7 +798,7 @@ export default class RoomClient
 			}
 		});
 
-		torrent.on('done', () => 
+		torrent.on('done', () =>
 		{
 			store.dispatch(
 				fileActions.setFileDone(
@@ -924,7 +948,7 @@ export default class RoomClient
 			{
 				await this.sendRequest(
 					'resumeProducer', { producerId: this._micProducer.id });
-	
+
 				store.dispatch(
 					producerActions.setProducerResumed(this._micProducer.id));
 			}
@@ -976,23 +1000,23 @@ export default class RoomClient
 		}
 	}
 
-	disconnectLocalHark() 
+	disconnectLocalHark()
 	{
 		logger.debug('disconnectLocalHark() | Stopping harkStream.');
-		if (this._harkStream != null) 
+		if (this._harkStream != null)
 		{
 			this._harkStream.getAudioTracks()[0].stop();
 			this._harkStream = null;
 		}
 
-		if (this._hark != null) 
+		if (this._hark != null)
 		{
 			logger.debug('disconnectLocalHark() Stopping hark.');
 			this._hark.stop();
 		}
 	}
 
-	connectLocalHark(track) 
+	connectLocalHark(track)
 	{
 		logger.debug('connectLocalHark() | Track:%o', track);
 		this._harkStream = new MediaStream();
@@ -1003,37 +1027,50 @@ export default class RoomClient
 		if (!this._harkStream.getAudioTracks()[0])
 			throw new Error('getMicStream():something went wrong with hark');
 
-		this._hark = hark(this._harkStream, { play: false });
-
-		// eslint-disable-next-line no-unused-vars
-		this._hark.on('volume_change', (dBs, threshold) => 
-		{
-			// The exact formula to convert from dBs (-100..0) to linear (0..1) is:
-			//   Math.pow(10, dBs / 20)
-			// However it does not produce a visually useful output, so let exagerate
-			// it a bit. Also, let convert it from 0..1 to 0..10 and avoid value 1 to
-			// minimize component renderings.
-			let volume = Math.round(Math.pow(10, dBs / 85) * 10);
-
-			if (volume === 1)
-				volume = 0;
-
-			volume = Math.round(volume);
-
-			if (this._micProducer && volume !== this._micProducer.volume) 
+		this._hark = hark(this._harkStream,
 			{
-				this._micProducer.volume = volume;
+				play      : false,
+				interval  : 5,
+				threshold : store.getState().settings.noiseThreshold,
+				history   : 300
+			});
+		this._hark.lastVolume = -100;
 
+		this._hark.on('volume_change', (volume) =>
+		{
+			volume = Math.round(volume);
+			if (this._micProducer && volume !== Math.round(this._hark.lastVolume))
+			{
+				if (volume < this._hark.lastVolume * 1.02)
+				{
+					volume = this._hark.lastVolume * 1.02;
+				}
+				this._hark.lastVolume = volume;
 				store.dispatch(peerVolumeActions.setPeerVolume(this._peerId, volume));
 			}
 		});
-		this._hark.on('speaking', function() 
+		this._hark.on('speaking', () =>
 		{
 			store.dispatch(meActions.setIsSpeaking(true));
+			if ((store.getState().settings.voiceActivatedUnmute ||
+				store.getState().me.isAutoMuted) &&
+				this._micProducer &&
+				this._micProducer.paused)
+			{
+				this._micProducer.resume();
+			}
+			store.dispatch(meActions.setAutoMuted(false)); // sanity action
 		});
-		this._hark.on('stopped_speaking', function()
+		this._hark.on('stopped_speaking', () =>
 		{
 			store.dispatch(meActions.setIsSpeaking(false));
+			if (store.getState().settings.voiceActivatedUnmute &&
+				this._micProducer &&
+				!this._micProducer.paused)
+			{
+				this._micProducer.pause();
+				store.dispatch(meActions.setAutoMuted(true));
+			}
 		});
 	}
 
@@ -1045,7 +1082,7 @@ export default class RoomClient
 			meActions.setAudioInProgress(true));
 
 		try
-		{								
+		{
 			const device = this._audioDevices[deviceId];
 
 			if (!device)
@@ -1164,7 +1201,7 @@ export default class RoomClient
 						...VIDEO_CONSTRAINS[resolution]
 					}
 				});
-				
+
 			if (stream)
 			{
 				const track = stream.getVideoTracks()[0];
@@ -1175,15 +1212,15 @@ export default class RoomClient
 					{
 						await this._webcamProducer.replaceTrack({ track });
 					}
-					else 
+					else
 					{
 						this._webcamProducer = await this._sendTransport.produce({
 							track,
-							appData : 
+							appData :
 							{
 								source : 'webcam'
 							}
-						});	
+						});
 					}
 
 					store.dispatch(
@@ -1193,7 +1230,7 @@ export default class RoomClient
 				{
 					logger.warn('getVideoTracks Error: First Video Track is null');
 				}
-	
+
 			}
 			else
 			{
@@ -1227,7 +1264,7 @@ export default class RoomClient
 
 			if (!device)
 				throw new Error('no webcam devices');
-			
+
 			logger.debug(
 				'changeWebcam() | new selected webcam [device:%o]',
 				device);
@@ -1255,17 +1292,17 @@ export default class RoomClient
 					{
 						await this._webcamProducer.replaceTrack({ track });
 					}
-					else 
+					else
 					{
 						this._webcamProducer = await this._sendTransport.produce({
 							track,
-							appData : 
+							appData :
 							{
 								source : 'webcam'
 							}
-						});	
+						});
 					}
-		
+
 					store.dispatch(
 						producerActions.setProducerTrack(this._webcamProducer.id, track));
 
@@ -1274,7 +1311,7 @@ export default class RoomClient
 				{
 					logger.warn('getVideoTracks Error: First Video Track is null');
 				}
-	
+
 			}
 			else
 			{
@@ -1962,23 +1999,12 @@ export default class RoomClient
 						producerPaused
 					} = request.data;
 
-					let codecOptions;
-
-					if (kind === 'audio')
-					{
-						codecOptions =
-						{
-							opusStereo : 1
-						};
-					}
-
 					const consumer = await this._recvTransport.consume(
 						{
 							id,
 							producerId,
 							kind,
 							rtpParameters,
-							codecOptions,
 							appData : { ...appData, peerId } // Trick.
 						});
 
@@ -2031,19 +2057,8 @@ export default class RoomClient
 
 						consumer.hark = hark(stream, { play: false });
 
-						// eslint-disable-next-line no-unused-vars
-						consumer.hark.on('volume_change', (dBs, threshold) =>
+						consumer.hark.on('volume_change', (volume) =>
 						{
-							// The exact formula to convert from dBs (-100..0) to linear (0..1) is:
-							//   Math.pow(10, dBs / 20)
-							// However it does not produce a visually useful output, so let exaggerate
-							// it a bit. Also, let convert it from 0..1 to 0..10 and avoid value 1 to
-							// minimize component renderings.
-							let volume = Math.round(Math.pow(10, dBs / 85) * 10);
-
-							if (volume === 1)
-								volume = 0;
-
 							volume = Math.round(volume);
 
 							if (consumer && volume !== consumer.volume)
@@ -2083,7 +2098,7 @@ export default class RoomClient
 
 						const { displayName } = store.getState().settings;
 						const { picture } = store.getState().me;
-	
+
 						await this.sendRequest('changeDisplayName', { displayName });
 						await this.sendRequest('changePicture', { picture });
 						break;
@@ -2092,10 +2107,10 @@ export default class RoomClient
 					case 'signInRequired':
 					{
 						store.dispatch(roomActions.setSignInRequired(true));
-	
+
 						break;
 					}
-						
+
 					case 'overRoomLimit':
 					{
 						store.dispatch(roomActions.setOverRoomLimit(true));
@@ -2111,24 +2126,24 @@ export default class RoomClient
 
 						store.dispatch(roomActions.toggleJoined());
 						store.dispatch(roomActions.setInLobby(false));
-	
+
 						await this._joinRoom({ joinVideo });
-	
+
 						break;
 					}
 
 					case 'roomBack':
 					{
 						await this._joinRoom({ joinVideo });
-	
+
 						break;
 					}
-	
+
 					case 'lockRoom':
 					{
 						store.dispatch(
 							roomActions.setRoomLocked());
-	
+
 						store.dispatch(requestActions.notify(
 							{
 								text : intl.formatMessage({
@@ -2136,15 +2151,15 @@ export default class RoomClient
 									defaultMessage : 'Room is now locked'
 								})
 							}));
-	
+
 						break;
 					}
-	
+
 					case 'unlockRoom':
 					{
 						store.dispatch(
 							roomActions.setRoomUnLocked());
-						
+
 						store.dispatch(requestActions.notify(
 							{
 								text : intl.formatMessage({
@@ -2152,21 +2167,21 @@ export default class RoomClient
 									defaultMessage : 'Room is now unlocked'
 								})
 							}));
-	
+
 						break;
 					}
-	
+
 					case 'parkedPeer':
 					{
 						const { peerId } = notification.data;
-	
+
 						store.dispatch(
 							lobbyPeerActions.addLobbyPeer(peerId));
 						store.dispatch(
 							roomActions.setToolbarsVisible(true));
 
 						this._soundNotification();
-	
+
 						store.dispatch(requestActions.notify(
 							{
 								text : intl.formatMessage({
@@ -2174,7 +2189,7 @@ export default class RoomClient
 									defaultMessage : 'New participant entered the lobby'
 								})
 							}));
-	
+
 						break;
 					}
 
@@ -2203,7 +2218,7 @@ export default class RoomClient
 									)
 								);
 							});
-	
+
 							store.dispatch(
 								roomActions.setToolbarsVisible(true));
 
@@ -2220,14 +2235,14 @@ export default class RoomClient
 
 						break;
 					}
-	
+
 					case 'lobby:peerClosed':
 					{
 						const { peerId } = notification.data;
-	
+
 						store.dispatch(
 							lobbyPeerActions.removeLobbyPeer(peerId));
-	
+
 						store.dispatch(requestActions.notify(
 							{
 								text : intl.formatMessage({
@@ -2235,10 +2250,10 @@ export default class RoomClient
 									defaultMessage : 'Participant in lobby left'
 								})
 							}));
-	
+
 						break;
 					}
-	
+
 					case 'lobby:promotedPeer':
 					{
 						const { peerId } = notification.data;
@@ -2248,7 +2263,7 @@ export default class RoomClient
 
 						break;
 					}
-	
+
 					case 'lobby:changeDisplayName':
 					{
 						const { peerId, displayName } = notification.data;
@@ -2268,11 +2283,11 @@ export default class RoomClient
 
 						break;
 					}
-					
+
 					case 'lobby:changePicture':
 					{
 						const { peerId, picture } = notification.data;
-	
+
 						store.dispatch(
 							lobbyPeerActions.setLobbyPeerPicture(picture, peerId));
 
@@ -2290,7 +2305,7 @@ export default class RoomClient
 					case 'setAccessCode':
 					{
 						const { accessCode } = notification.data;
-	
+
 						store.dispatch(
 							roomActions.setAccessCode(accessCode));
 
@@ -2304,14 +2319,14 @@ export default class RoomClient
 
 						break;
 					}
-	
+
 					case 'setJoinByAccessCode':
 					{
 						const { joinByAccessCode } = notification.data;
-						
+
 						store.dispatch(
 							roomActions.setJoinByAccessCode(joinByAccessCode));
-						
+
 						if (joinByAccessCode)
 						{
 							store.dispatch(requestActions.notify(
@@ -2322,7 +2337,7 @@ export default class RoomClient
 									})
 								}));
 						}
-						else 
+						else
 						{
 							store.dispatch(requestActions.notify(
 								{
@@ -2335,20 +2350,20 @@ export default class RoomClient
 
 						break;
 					}
-	
+
 					case 'activeSpeaker':
 					{
 						const { peerId } = notification.data;
-	
+
 						store.dispatch(
 							roomActions.setRoomActiveSpeaker(peerId));
 
 						if (peerId && peerId !== this._peerId)
 							this._spotlights.handleActiveSpeaker(peerId);
-	
+
 						break;
 					}
-	
+
 					case 'changeDisplayName':
 					{
 						const { peerId, displayName, oldDisplayName } = notification.data;
@@ -2556,74 +2571,74 @@ export default class RoomClient
 					{
 						const { consumerId } = notification.data;
 						const consumer = this._consumers.get(consumerId);
-	
+
 						if (!consumer)
 							break;
-	
+
 						consumer.close();
-	
+
 						if (consumer.hark != null)
 							consumer.hark.stop();
-	
+
 						this._consumers.delete(consumerId);
-	
+
 						const { peerId } = consumer.appData;
-	
+
 						store.dispatch(
 							consumerActions.removeConsumer(consumerId, peerId));
-	
+
 						break;
 					}
-	
+
 					case 'consumerPaused':
 					{
 						const { consumerId } = notification.data;
 						const consumer = this._consumers.get(consumerId);
-	
+
 						if (!consumer)
 							break;
-	
+
 						store.dispatch(
 							consumerActions.setConsumerPaused(consumerId, 'remote'));
 
 						break;
 					}
-	
+
 					case 'consumerResumed':
 					{
 						const { consumerId } = notification.data;
 						const consumer = this._consumers.get(consumerId);
-	
+
 						if (!consumer)
 							break;
-	
+
 						store.dispatch(
 							consumerActions.setConsumerResumed(consumerId, 'remote'));
-	
+
 						break;
 					}
-	
+
 					case 'consumerLayersChanged':
 					{
 						const { consumerId, spatialLayer, temporalLayer } = notification.data;
 						const consumer = this._consumers.get(consumerId);
-	
+
 						if (!consumer)
 							break;
-	
+
 						store.dispatch(consumerActions.setConsumerCurrentLayers(
 							consumerId, spatialLayer, temporalLayer));
-	
+
 						break;
 					}
-	
+
 					case 'consumerScore':
 					{
 						const { consumerId, score } = notification.data;
-	
+
 						store.dispatch(
 							consumerActions.setConsumerScore(consumerId, score));
-	
+
 						break;
 					}
 
@@ -2667,7 +2682,7 @@ export default class RoomClient
 						store.dispatch(requestActions.notify(
 							{
 								text : intl.formatMessage({
-									id             : 'moderator.muteScreenSharingModerator',
+									id             : 'moderator.stopScreenSharing',
 									defaultMessage : 'Moderator stopped your screen sharing'
 								})
 							}));
@@ -2737,7 +2752,7 @@ export default class RoomClient
 
 						break;
 					}
-	
+
 					default:
 					{
 						logger.error(
@@ -2784,7 +2799,7 @@ export default class RoomClient
 			this._webTorrent.on('error', (error) =>
 			{
 				logger.error('Filesharing [error:"%o"]', error);
-	
+
 				store.dispatch(requestActions.notify(
 					{
 						type : 'error',
@@ -3006,7 +3021,7 @@ export default class RoomClient
 				);
 			}
 
-			locked ? 
+			locked ?
 				store.dispatch(roomActions.setRoomLocked()) :
 				store.dispatch(roomActions.setRoomUnLocked());
 
@@ -3032,14 +3047,14 @@ export default class RoomClient
 						await this.enableMic();
 						const { autoMuteThreshold } = store.getState().settings;
 
-						if (autoMuteThreshold && peers.length > autoMuteThreshold) 
+						if (autoMuteThreshold && peers.length > autoMuteThreshold)
 							this.muteMic();
 					}
 
 				if (joinVideo && this._mediasoupDevice.canProduce('video'))
 					this.enableWebcam();
 			}
-			
+
 			await this._updateAudioOutputDevices();
 
 			const { selectedAudioOutputDevice } = store.getState().settings;
@@ -3052,7 +3067,7 @@ export default class RoomClient
 					)
 				);
 			}
-		
+
 			store.dispatch(roomActions.setRoomState('connected'));
 
 			// Clean all the existing notifications.
@@ -3236,7 +3251,7 @@ export default class RoomClient
 
 			if (!device)
 				throw new Error('no webcam devices');
-			
+
 			logger.debug(
 				'addExtraVideo() | new selected webcam [device:%o]',
 				device);
@@ -3281,7 +3296,7 @@ export default class RoomClient
 						{
 							videoGoogleStartBitrate : 1000
 						},
-						appData : 
+						appData :
 						{
 							source : 'extravideo'
 						}
@@ -3291,7 +3306,7 @@ export default class RoomClient
 			{
 				producer = await this._sendTransport.produce({
 					track,
-					appData : 
+					appData :
 					{
 						source : 'extravideo'
 					}
@@ -3385,7 +3400,7 @@ export default class RoomClient
 
 			if (!device)
 				throw new Error('no audio devices');
-			
+
 			logger.debug(
 				'enableMic() | new selected audio device [device:%o]',
 				device);
@@ -3422,7 +3437,7 @@ export default class RoomClient
 						opusPtime           : '3',
 						opusMaxPlaybackRate	: 48000
 					},
-					appData : 
+					appData :
 					{ source: 'mic' }
 				});
 
@@ -3582,7 +3597,7 @@ export default class RoomClient
 						{
 							videoGoogleStartBitrate : 1000
 						},
-						appData : 
+						appData :
 						{
 							source : 'screen'
 						}
@@ -3592,7 +3607,7 @@ export default class RoomClient
 			{
 				this._screenSharingProducer = await this._sendTransport.produce({
 					track,
-					appData : 
+					appData :
 					{
 						source : 'screen'
 					}
@@ -3710,7 +3725,7 @@ export default class RoomClient
 
 			if (!device)
 				throw new Error('no webcam devices');
-			
+
 			logger.debug(
 				'_setWebcamProducer() | new selected webcam [device:%o]',
 				device);
@@ -3753,7 +3768,7 @@ export default class RoomClient
 						{
 							videoGoogleStartBitrate : 1000
 						},
-						appData : 
+						appData :
 						{
 							source : 'webcam'
 						}
@@ -3763,7 +3778,7 @@ export default class RoomClient
 			{
 				this._webcamProducer = await this._sendTransport.produce({
 					track,
-					appData : 
+					appData :
 					{
 						source : 'webcam'
 					}
@@ -3888,6 +3903,14 @@ export default class RoomClient
 		store.dispatch(meActions.setWebcamInProgress(false));
 	}
 
+	async _setNoiseThreshold(threshold)
+	{
+		logger.debug('_setNoiseThreshold:%s', threshold);
+		this._hark.setThreshold(threshold);
+		store.dispatch(
+			settingsActions.setNoiseThreshold(threshold));
+	}
+
 	async _updateAudioDevices()
 	{
 		logger.debug('_updateAudioDevices()');
diff --git a/app/src/actions/meActions.js b/app/src/actions/meActions.js
index 7fb34ea..be7c1ee 100644
--- a/app/src/actions/meActions.js
+++ b/app/src/actions/meActions.js
@@ -110,3 +110,9 @@ export const setIsSpeaking = (flag) =>
 		type    : 'SET_IS_SPEAKING',
 		payload : { flag }
 	});
+
+export const setAutoMuted = (flag) =>
+	({
+		type    : 'SET_AUTO_MUTED',
+		payload : { flag }
+	});
diff --git a/app/src/actions/settingsActions.js b/app/src/actions/settingsActions.js
index 21ff2fd..90b019a 100644
--- a/app/src/actions/settingsActions.js
+++ b/app/src/actions/settingsActions.js
@@ -71,6 +71,18 @@ export const setNoiseSuppression = (noiseSuppression) =>
 		payload : { noiseSuppression }
 	});
 
+export const setVoiceActivatedUnmute = (voiceActivatedUnmute) =>
+	({
+		type: 'SET_VOICE_ACTIVATED_UNMUTE',
+		payload: { voiceActivatedUnmute }
+	});
+
+export const setNoiseThreshold = (noiseThreshold) =>
+	({
+		type: 'SET_NOISE_THRESHOLD',
+		payload: { noiseThreshold }
+	});
+
 export const setDefaultAudio = (audio) =>
 	({
 		type    : 'SET_DEFAULT_AUDIO',
diff --git a/app/src/components/Containers/Me.js b/app/src/components/Containers/Me.js
index 8e0eb8e..85b2ca9 100644
--- a/app/src/components/Containers/Me.js
+++ b/app/src/components/Containers/Me.js
@@ -137,10 +137,10 @@ const styles = (theme) =>
 			transform       : 'translate(-50%, 0%)',
 			color           : 'rgba(255, 255, 255, 0.7)',
 			fontSize        : '1.3em',
-			backgroundColor : 'rgba(255, 0, 0, 0.9)',
+			backgroundColor : 'rgba(245, 0, 87, 0.70)',
 			margin          : '4px',
 			padding         : theme.spacing(2),
-			zIndex          : 31,
+			zIndex          : 1200,
 			borderRadius    : '20px',
 			textAlign       : 'center',
 			opacity         : 0,
@@ -176,6 +176,7 @@ const Me = (props) =>
 		screenProducer,
 		extraVideoProducers,
 		canShareScreen,
+		noiseVolume,
 		classes
 	} = props;
 
@@ -440,7 +441,12 @@ const Me = (props) =>
 												})}
 												className={classes.smallContainer}
 												disabled={!me.canSendMic || me.audioInProgress}
-												color={micState === 'on' ? 'primary' : 'secondary'}
+												color={
+													micState === 'on' ? 
+														settings.voiceActivatedUnmute && !me.isAutoMuted ? 
+															'primary'
+															: 'default'
+														: 'secondary'}
 												size='small'
 												onClick={() =>
 												{
@@ -453,7 +459,10 @@ const Me = (props) =>
 												}}
 											>
 												{ micState === 'on' ?
-													<MicIcon />
+													<MicIcon 
+														color={me.isAutoMuted ? 'secondary' : 'primary'}
+														style={{ opacity: noiseVolume }}
+													/>
 													:
 													<MicOffIcon />
 												}
@@ -468,7 +477,10 @@ const Me = (props) =>
 												})}
 												className={classes.fab}
 												disabled={!me.canSendMic || me.audioInProgress}
-												color={micState === 'on' ? 'default' : 'secondary'}
+												color={micState === 'on' ? 
+													settings.voiceActivatedUnmute && !me.isAutoMuted? 'primary'
+														: 'default' 
+													: 'secondary'}
 												size='large'
 												onClick={() =>
 												{
@@ -481,7 +493,11 @@ const Me = (props) =>
 												}}
 											>
 												{ micState === 'on' ?
-													<MicIcon />
+													<MicIcon
+														color={me.isAutoMuted && settings.voiceActivatedUnmute ? 'secondary' : 'primary'}
+														style={me.isAutoMuted && settings.voiceActivatedUnmute ? { opacity: noiseVolume }  
+															: { opacity: 1 }}
+													/>
 													:
 													<MicOffIcon />
 												}
@@ -868,6 +884,7 @@ Me.propTypes =
 	style               : PropTypes.object,
 	smallContainer      : PropTypes.bool,
 	canShareScreen      : PropTypes.bool.isRequired,
+	noiseVolume         : PropTypes.number,
 	classes             : PropTypes.object.isRequired,
 	theme               : PropTypes.object.isRequired
 };
@@ -878,12 +895,26 @@ const makeMapStateToProps = () =>
 
 	const mapStateToProps = (state) =>
 	{
+		let volume;
+		
+		// noiseVolume under threshold
+		if (state.peerVolumes[state.me.id] < state.settings.noiseThreshold) 
+		{
+			// noiseVolume mapped to range 0.5 ... 1 (threshold switch)
+			volume = 1 + ((Math.abs(state.peerVolumes[state.me.id] - 
+				state.settings.noiseThreshold) / (-120 -
+				state.settings.noiseThreshold)));
+		} 
+		// noiseVolume over threshold: no noise but voice
+		else { volume = 0; }
+
 		return {
 			me             : state.me,
 			...meProducersSelector(state),
 			settings       : state.settings,
 			activeSpeaker  : state.me.id === state.room.activeSpeakerId,
-			canShareScreen : hasPermission(state)
+			canShareScreen : hasPermission(state),
+			noiseVolume    : volume
 		};
 	};
 
@@ -900,6 +931,8 @@ export default withRoomContext(connect(
 			return (
 				prev.room === next.room &&
 				prev.me === next.me &&
+				Math.round(prev.peerVolumes[prev.me.id]) === 
+					Math.round(next.peerVolumes[next.me.id]) &&
 				prev.peers === next.peers &&
 				prev.producers === next.producers &&
 				prev.settings === next.settings
diff --git a/app/src/components/Containers/Volume.js b/app/src/components/Containers/Volume.js
index 3c13a39..81a050b 100644
--- a/app/src/components/Containers/Volume.js
+++ b/app/src/components/Containers/Volume.js
@@ -94,17 +94,17 @@ const styles = () =>
 		smallBar :
 		{
 			flex               : '0 0 auto',
-			margin             : '0.3rem',
 			backgroundSize     : '75%',
 			backgroundRepeat   : 'no-repeat',
 			backgroundColor    : 'rgba(0, 0, 0, 1)',
 			cursor             : 'pointer',
 			transitionProperty : 'opacity, background-color',
 			width              : 3,
-			borderRadius       : 6,
+			borderRadius       : 2,
 			transitionDuration : '0.25s',
 			position           : 'absolute',
-			bottom             : 0,
+			top                : '50%',
+			transform          : 'translateY(-50%)',
 			'&.level0'         : { height: 0 },
 			'&.level1'         : { height: '0.2vh' },
 			'&.level2'         : { height: '0.4vh' },
@@ -149,9 +149,16 @@ const makeMapStateToProps = (initialState, props) =>
 {
 	const mapStateToProps = (state) =>
 	{
-		return {
-			volume : state.peerVolumes[props.id]
-		};
+		if (state.peerVolumes[props.id]>state.settings.noiseThreshold)
+		{
+			return {
+				volume : Math.round((state.peerVolumes[props.id]+100) / 10)
+			};
+		}
+		else
+		{
+			return { volume: 0 };
+		}
 	};
 
 	return mapStateToProps;
diff --git a/app/src/components/Controls/About.js b/app/src/components/Controls/About.js
index d361a8c..c462549 100644
--- a/app/src/components/Controls/About.js
+++ b/app/src/components/Controls/About.js
@@ -42,8 +42,9 @@ const styles = (theme) =>
 		},
 		link :
 		{
-			display   : 'block',
-			textAlign : 'center'
+			display      : 'block',
+			textAlign    : 'center',
+			marginBottom : theme.spacing(1)
 		}
 	});
 
@@ -68,15 +69,16 @@ const About = ({
 				/>
 			</DialogTitle>
 			<DialogContent dividers='true'>
-				<DialogContentText>
+				<DialogContentText paragraph> 
 					Contributions to this work were made on behalf of the GÉANT
 					project, a project that has received funding from the
 					European Union’s Horizon 2020 research and innovation 
 					programme under Grant Agreement No. 731122 (GN4-2). 
 					On behalf of GÉANT project, GÉANT Association is the sole
 					owner of the copyright in all material which was developed 
-					by a member of the GÉANT project.<br />
-					<br />
+					by a member of the GÉANT project.
+				</DialogContentText>
+				<DialogContentText paragraph> 
 					GÉANT Vereniging (Association) is registered with the
 					Chamber of Commerce in Amsterdam with registration number
 					40535155 and operates in the UK as a branch of GÉANT
@@ -87,6 +89,13 @@ const About = ({
 				<Link href='https://edumeet.org' target='_blank' rel='noreferrer' color='secondary' variant='h6' className={classes.link}>
 					https://edumeet.org
 				</Link>
+				<DialogContentText align='center' variant='h7'>
+					<FormattedMessage
+						id='label.version'
+						defaultMessage='Version'
+					/>
+					:{` ${process.env.REACT_APP_VERSION}`}
+				</DialogContentText>
 			</DialogContent>
 			<DialogActions>
 				{ window.config.logo && <img alt='Logo' className={classes.logo} src={window.config.logo} /> }
diff --git a/app/src/components/Controls/TopBar.js b/app/src/components/Controls/TopBar.js
index 148f4a7..55bb849 100644
--- a/app/src/components/Controls/TopBar.js
+++ b/app/src/components/Controls/TopBar.js
@@ -312,7 +312,7 @@ const TopBar = (props) =>
 					</Typography>
 					<div className={classes.grow} />
 					<div className={classes.sectionDesktop}>
-						<Tooltip 
+						<Tooltip
 							title={intl.formatMessage({
 								id             : 'label.moreActions',
 								defaultMessage : 'More actions'
@@ -350,7 +350,7 @@ const TopBar = (props) =>
 								</IconButton>
 							</Tooltip>
 						}
-						<Tooltip 
+						<Tooltip
 							title={intl.formatMessage({
 								id             : 'tooltip.participants',
 								defaultMessage : 'Show participants'
@@ -421,7 +421,7 @@ const TopBar = (props) =>
 							</span>
 						</Tooltip>
 						{ lobbyPeers.length > 0 &&
-							<Tooltip 
+							<Tooltip
 								title={intl.formatMessage({
 									id             : 'tooltip.lobby',
 									defaultMessage : 'Show lobby'
@@ -457,7 +457,7 @@ const TopBar = (props) =>
 									})}
 									className={classes.actionButton}
 									color='inherit'
-									onClick={() => 
+									onClick={() =>
 									{
 										loggedIn ? roomClient.logout() : roomClient.login();
 									}}
@@ -472,6 +472,34 @@ const TopBar = (props) =>
 						}
 					</div>
 					<div className={classes.sectionMobile}>
+						{ lobbyPeers.length > 0 &&
+						<Tooltip
+							title={intl.formatMessage({
+								id             : 'tooltip.lobby',
+								defaultMessage : 'Show lobby'
+							})}
+						>
+							<span className={classes.disabledButton}>
+								<IconButton
+									aria-label={intl.formatMessage({
+										id             : 'tooltip.lobby',
+										defaultMessage : 'Show lobby'
+									})}
+									className={classes.actionButton}
+									color='inherit'
+									disabled={!canPromote}
+									onClick={() => setLockDialogOpen(!room.lockDialogOpen)}
+								>
+									<PulsingBadge
+										color='secondary'
+										badgeContent={lobbyPeers.length}
+									>
+										<SecurityIcon />
+									</PulsingBadge>
+								</IconButton>
+							</span>
+						</Tooltip>
+						}
 						<IconButton
 							aria-haspopup='true'
 							onClick={handleMobileMenuOpen}
@@ -480,34 +508,6 @@ const TopBar = (props) =>
 							<MoreIcon />
 						</IconButton>
 					</div>
-					{ lobbyPeers.length > 0 &&
-					<Tooltip 
-						title={intl.formatMessage({
-							id             : 'tooltip.lobby',
-							defaultMessage : 'Show lobby'
-						})}
-					>
-						<span className={classes.disabledButton}>
-							<IconButton
-								aria-label={intl.formatMessage({
-									id             : 'tooltip.lobby',
-									defaultMessage : 'Show lobby'
-								})}
-								className={classes.actionButton}
-								color='inherit'
-								disabled={!canPromote}
-								onClick={() => setLockDialogOpen(!room.lockDialogOpen)}
-							>
-								<PulsingBadge
-									color='secondary'
-									badgeContent={lobbyPeers.length}
-								>
-									<SecurityIcon />
-								</PulsingBadge>
-							</IconButton>
-						</span>
-					</Tooltip>
-					}					
 					<div className={classes.divider} />
 					<Button
 						aria-label={intl.formatMessage({
@@ -558,8 +558,8 @@ const TopBar = (props) =>
 								/>
 							</p>
 						</MenuItem>
-						<MenuItem 
-							onClick={() => 
+						<MenuItem
+							onClick={() =>
 							{
 								handleMenuClose();
 								setHelpOpen(!room.helpOpen);
@@ -578,8 +578,8 @@ const TopBar = (props) =>
 								/>
 							</p>
 						</MenuItem>
-						<MenuItem 
-							onClick={() => 
+						<MenuItem
+							onClick={() =>
 							{
 								handleMenuClose();
 								setAboutOpen(!room.aboutOpen);
@@ -612,7 +612,7 @@ const TopBar = (props) =>
 				{ loginEnabled &&
 					<MenuItem
 						aria-label={loginTooltip}
-						onClick={() => 
+						onClick={() =>
 						{
 							handleMenuClose();
 							loggedIn ? roomClient.logout() : roomClient.login();
@@ -697,33 +697,6 @@ const TopBar = (props) =>
 						/>
 					</p>
 				</MenuItem>
-				{ lobbyPeers.length > 0 &&
-					<MenuItem 
-						aria-label={intl.formatMessage({
-							id             : 'tooltip.lobby',
-							defaultMessage : 'Show lobby'
-						})}
-						disabled={!canPromote}
-						onClick={() =>
-						{
-							handleMenuClose();
-							setLockDialogOpen(!room.lockDialogOpen);
-						}}
-					>
-						<PulsingBadge
-							color='secondary'
-							badgeContent={lobbyPeers.length}
-						>
-							<SecurityIcon />
-						</PulsingBadge>
-						<p className={classes.moreAction}>
-							<FormattedMessage
-								id='tooltip.lobby'
-								defaultMessage='Show lobby'
-							/>
-						</p>
-					</MenuItem>
-				}
 				<MenuItem
 					aria-label={intl.formatMessage({
 						id             : 'tooltip.participants',
diff --git a/app/src/components/Settings/MediaSettings.js b/app/src/components/Settings/MediaSettings.js
index 28a69a2..d326b91 100644
--- a/app/src/components/Settings/MediaSettings.js
+++ b/app/src/components/Settings/MediaSettings.js
@@ -6,31 +6,66 @@ import { withRoomContext } from '../../RoomContext';
 import * as settingsActions from '../../actions/settingsActions';
 import PropTypes from 'prop-types';
 import { useIntl, FormattedMessage } from 'react-intl';
+import classnames from 'classnames';
 import MenuItem from '@material-ui/core/MenuItem';
 import FormHelperText from '@material-ui/core/FormHelperText';
 import FormControl from '@material-ui/core/FormControl';
 import FormControlLabel from '@material-ui/core/FormControlLabel';
 import Select from '@material-ui/core/Select';
 import Checkbox from '@material-ui/core/Checkbox';
+import Slider from '@material-ui/core/Slider';
+import Typography from '@material-ui/core/Typography';
 
-const styles = (theme) =>
-	({
-		setting :
+const NoiseSlider = withStyles(
+	{
+		root : 
 		{
-			padding : theme.spacing(2)
+			color   : '#3880ff',
+			height  : 2,
+			padding : '15px 0'
 		},
-		formControl :
-		{
-			display : 'flex'
+		track : {
+			height : 2
+		},
+		rail : {
+			height  : 2,
+			opacity : 0.2
+		},
+		mark : {
+			backgroundColor : '#bfbfbf',
+			height          : 10,
+			width           : 3,
+			marginTop       : -3
+		},
+		markActive : {
+			opacity         : 1,
+			backgroundColor : 'currentColor'
 		}
-	});
+	})(Slider);
+
+const styles = (theme) => ({
+	setting :
+	{
+		padding : theme.spacing(2)
+	},
+	margin : 
+	{
+		height : theme.spacing(3)
+	},
+	formControl :
+	{
+		display : 'flex'
+	}
+});
 
 const MediaSettings = ({
 	setEchoCancellation,
 	setAutoGainControl,
 	setNoiseSuppression,
+	setVoiceActivatedUnmute,
 	roomClient,
 	me,
+	volume,
 	settings,
 	classes
 }) =>
@@ -135,6 +170,34 @@ const MediaSettings = ({
 						}
 					</FormHelperText>
 				</FormControl>
+				<FormControl className={classes.formControl}>
+					<Select
+						value={settings.resolution || ''}
+						onChange={(event) => 
+						{
+							if (event.target.value)
+								roomClient.changeVideoResolution(event.target.value);
+						}}
+						name='Video resolution'
+						autoWidth
+						className={classes.selectEmpty}
+					>
+						{resolutions.map((resolution, index) => 
+						{
+							return (
+								<MenuItem key={index} value={resolution.value}>
+									{resolution.label}
+								</MenuItem>
+							);
+						})}
+					</Select>
+					<FormHelperText>
+						<FormattedMessage
+							id='settings.resolution'
+							defaultMessage='Select your video resolution'
+						/>
+					</FormHelperText>
+				</FormControl>
 			</form>
 			<form className={classes.setting} autoComplete='off'>
 				<FormControl className={classes.formControl}>
@@ -148,7 +211,7 @@ const MediaSettings = ({
 						displayEmpty
 						name={intl.formatMessage({
 							id             : 'settings.audio',
-							defaultMessage : 'Audio device'
+							defaultMessage : 'Audio input device'
 						})}
 						autoWidth
 						className={classes.selectEmpty}
@@ -165,12 +228,12 @@ const MediaSettings = ({
 						{ audioDevices.length > 0 ?
 							intl.formatMessage({
 								id             : 'settings.selectAudio',
-								defaultMessage : 'Select audio device'
+								defaultMessage : 'Select audio input device'
 							})
 							:
 							intl.formatMessage({
 								id             : 'settings.cantSelectAudio',
-								defaultMessage : 'Unable to select audio device'
+								defaultMessage : 'Unable to select audio input device'
 							})
 						}
 					</FormHelperText>
@@ -225,34 +288,6 @@ const MediaSettings = ({
 				</form>
 			}
 			<form className={classes.setting} autoComplete='off'>
-				<FormControl className={classes.formControl}>
-					<Select
-						value={settings.resolution || ''}
-						onChange={(event) =>
-						{
-							if (event.target.value)
-								roomClient.changeVideoResolution(event.target.value);
-						}}
-						name='Video resolution'
-						autoWidth
-						className={classes.selectEmpty}
-					>
-						{ resolutions.map((resolution, index) =>
-						{
-							return (
-								<MenuItem key={index} value={resolution.value}>
-									{resolution.label}
-								</MenuItem>
-							);
-						})}
-					</Select>
-					<FormHelperText>
-						<FormattedMessage
-							id='settings.resolution'
-							defaultMessage='Select your video resolution'
-						/>
-					</FormHelperText>
-				</FormControl>
 				<FormControlLabel
 					className={classes.setting}
 					control={
@@ -298,6 +333,43 @@ const MediaSettings = ({
 						defaultMessage : 'Noise suppression'
 					})}
 				/>
+				<FormControlLabel
+					className={classes.setting}
+					control={
+						<Checkbox checked={settings.voiceActivatedUnmute} onChange={
+							(event) => 
+							{
+								setVoiceActivatedUnmute(event.target.checked);
+							}}
+						/>}
+					label={intl.formatMessage({
+						id             : 'settings.voiceActivatedUnmute',
+						defaultMessage : 'Voice activated unmute'
+					})}
+				/>
+				<div className={classes.margin} />
+				<Typography gutterBottom>
+					{
+						intl.formatMessage({
+							id             : 'settings.noiseThreshold',
+							defaultMessage : 'Noise threshold:'
+						})
+					}
+				</Typography>
+				<NoiseSlider className={classnames(classes.slider, classnames.setting)} 
+					key={'noise-threshold-slider'}
+					min={-100}
+					value={settings.noiseThreshold}
+					max={0} 
+					valueLabelDisplay={'off'}
+					onChange={
+						(event, value) =>
+						{
+							roomClient._setNoiseThreshold(value);
+						}}
+					marks={[ { value: volume, label: 'level' } ]}  
+				/>
+				<div className={classes.margin} />
 			</form>
 		</React.Fragment>
 	);
@@ -305,27 +377,31 @@ const MediaSettings = ({
 
 MediaSettings.propTypes =
 {
-	roomClient          : PropTypes.any.isRequired,
-	setEchoCancellation : PropTypes.func.isRequired,
-	setAutoGainControl  : PropTypes.func.isRequired,
-	setNoiseSuppression : PropTypes.func.isRequired,
-	me                  : appPropTypes.Me.isRequired,
-	settings            : PropTypes.object.isRequired,
-	classes             : PropTypes.object.isRequired
+	roomClient              : PropTypes.any.isRequired,
+	setEchoCancellation     : PropTypes.func.isRequired,
+	setAutoGainControl      : PropTypes.func.isRequired,
+	setNoiseSuppression     : PropTypes.func.isRequired,
+	setVoiceActivatedUnmute : PropTypes.func.isRequired,
+	me                      : appPropTypes.Me.isRequired,
+	volume                  : PropTypes.number,
+	settings                : PropTypes.object.isRequired,
+	classes                 : PropTypes.object.isRequired
 };
 
 const mapStateToProps = (state) =>
 {
 	return {
 		me       : state.me,
+		volume   : state.peerVolumes[state.me.id],
 		settings : state.settings
 	};
 };
 
 const mapDispatchToProps = {
-	setEchoCancellation : settingsActions.setEchoCancellation,
-	setAutoGainControl  : settingsActions.toggleAutoGainControl,
-	setNoiseSuppression : settingsActions.toggleNoiseSuppression
+	setEchoCancellation     : settingsActions.setEchoCancellation,
+	setAutoGainControl      : settingsActions.toggleAutoGainControl,
+	setNoiseSuppression     : settingsActions.toggleNoiseSuppression,
+	setVoiceActivatedUnmute : settingsActions.setVoiceActivatedUnmute
 };
 
 export default withRoomContext(connect(
@@ -337,7 +413,8 @@ export default withRoomContext(connect(
 		{
 			return (
 				prev.me === next.me &&
-				prev.settings === next.settings
+				prev.settings === next.settings &&
+				prev.peerVolumes[prev.me.id] === next[next.me.id]
 			);
 		}
 	}
diff --git a/app/src/reducers/me.js b/app/src/reducers/me.js
index f3fff66..35336a6 100644
--- a/app/src/reducers/me.js
+++ b/app/src/reducers/me.js
@@ -18,7 +18,8 @@ const initialState =
 	raisedHand            : false,
 	raisedHandInProgress  : false,
 	loggedIn              : false,
-	isSpeaking            : false
+	isSpeaking            : false,
+	isAutoMuted           : true
 };
 
 const me = (state = initialState, action) =>
@@ -162,6 +163,13 @@ const me = (state = initialState, action) =>
 			return { ...state, isSpeaking: flag };
 		}
 
+		case 'SET_AUTO_MUTED':
+		{
+			const { flag } = action.payload;
+
+			return { ...state, isAutoMuted: flag };
+		}
+
 		default:
 			return state;
 	}
diff --git a/app/src/reducers/peerVolumes.js b/app/src/reducers/peerVolumes.js
index fafe739..826a038 100644
--- a/app/src/reducers/peerVolumes.js
+++ b/app/src/reducers/peerVolumes.js
@@ -31,9 +31,10 @@ const peerVolumes = (state = initialState, action) =>
 
 		case 'SET_PEER_VOLUME':
 		{
-			const { peerId, volume } = action.payload;
+			const { peerId } = action.payload;
+			const dBs = action.payload.volume < -100 ? -100 : action.payload.volume;
 
-			return { ...state, [peerId]: volume };
+			return { ...state, [peerId]: Math.round(dBs) };
 		}
 
 		default:
diff --git a/app/src/reducers/settings.js b/app/src/reducers/settings.js
index f810d3a..750df24 100644
--- a/app/src/reducers/settings.js
+++ b/app/src/reducers/settings.js
@@ -1,26 +1,28 @@
 const initialState =
 {
-	displayName         : 'Guest',
-	selectedWebcam      : null,
-	selectedAudioDevice : null,
-	advancedMode        : false,
-	sampleRate          : 48000,
-	channelCount        : 1,
-	volume              : 1.0,
-	autoGainControl     : true,
-	echoCancellation    : true,
-	noiseSuppression    : true,
-	sampleSize          : 16,
+	displayName          : 'Guest',
+	selectedWebcam       : null,
+	selectedAudioDevice  : null,
+	advancedMode         : false,
+	sampleRate           : 48000,
+	channelCount         : 1,
+	volume               : 1.0,
+	autoGainControl      : false,
+	echoCancellation     : true,
+	noiseSuppression     : true,
+	voiceActivatedUnmute : false,
+	noiseThreshold       : -50,
+	sampleSize           : 16,
 	// low, medium, high, veryhigh, ultra
-	resolution          : window.config.defaultResolution || 'medium',
-	lastN               : 4,
-	permanentTopBar     : true,
-	hiddenControls      : false,
-	showNotifications   : true,
-	notificationSounds  : true,
-	buttonControlBar    : window.config.buttonControlBar || false,
-	drawerOverlayed     : window.config.drawerOverlayed || true,
-	autoMuteThreshold   : window.config.autoMuteThreshold || 4,
+	resolution           : window.config.defaultResolution || 'medium',
+	lastN                : 4,
+	permanentTopBar      : true,
+	hiddenControls       : false,
+	showNotifications    : true,
+	notificationSounds   : true,
+	buttonControlBar     : window.config.buttonControlBar || false,
+	drawerOverlayed      : window.config.drawerOverlayed || true,
+	autoMuteThreshold    : window.config.autoMuteThreshold || 4,
 	...window.config.defaultAudio
 };
 
@@ -99,6 +101,20 @@ const settings = (state = initialState, action) =>
 			return { ...state, noiseSuppression };
 		}
 
+		case 'SET_VOICE_ACTIVATED_UNMUTE':
+		{
+			const { voiceActivatedUnmute } = action.payload;
+
+			return { ...state, voiceActivatedUnmute };
+		}
+
+		case 'SET_NOISE_THRESHOLD':
+		{
+			const { noiseThreshold } = action.payload;
+
+			return { ...state, noiseThreshold };
+		}
+
 		case 'SET_DEFAULT_AUDIO':
 		{
 			const { audio } = action.payload;
diff --git a/app/src/translations/cn.json b/app/src/translations/cn.json
index 2f05967..6ecd36f 100644
--- a/app/src/translations/cn.json
+++ b/app/src/translations/cn.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "设置",
 	"settings.camera": "视频设备",
@@ -190,6 +191,7 @@
 	"moderator.muteAudio": null,
 	"moderator.muteVideo": null,
 	"moderator.muteScreenSharing": null,
+	"moderator.stopScreenSharing": null,
 
 	"unsupportedBrowser.titleUnsupportedBrowser": null,
 	"unsupportedBrowser.titlewebrtcUnavailable": null,
diff --git a/app/src/translations/cs.json b/app/src/translations/cs.json
index 281eba2..3305f92 100644
--- a/app/src/translations/cs.json
+++ b/app/src/translations/cs.json
@@ -118,6 +118,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Nastavení",
 	"settings.camera": "Kamera",
@@ -189,6 +190,7 @@
 	"moderator.muteAudio": null,
 	"moderator.muteVideo": null,
 	"moderator.muteScreenSharing": null,
+	"moderator.stopScreenSharing": null,
 
 	"unsupportedBrowser.titleUnsupportedBrowser": null,
 	"unsupportedBrowser.titlewebrtcUnavailable": null,
diff --git a/app/src/translations/de.json b/app/src/translations/de.json
index f1d65b1..6a5dcf6 100644
--- a/app/src/translations/de.json
+++ b/app/src/translations/de.json
@@ -119,6 +119,7 @@
 	"label.addVideo": "Video hinzufügen",
 	"label.promoteAllPeers": "Alle Teilnehmer reinlassen",
 	"label.moreActions": "Weitere Aktionen",
+	"label.version": null,
 
 	"settings.settings": "Einstellungen",
 	"settings.camera": "Kamera",
@@ -190,6 +191,7 @@
 	"moderator.muteAudio": "Moderator hat dich stummgeschaltet",
 	"moderator.muteVideo": "Moderator hat dein Video gestoppt",
 	"moderator.muteScreenSharing": null,
+	"moderator.stopScreenSharing": null,
 
 	"unsupportedBrowser.titleUnsupportedBrowser": null,
 	"unsupportedBrowser.titlewebrtcUnavailable": null,
diff --git a/app/src/translations/dk.json b/app/src/translations/dk.json
index 6e1e3dd..bf09c55 100644
--- a/app/src/translations/dk.json
+++ b/app/src/translations/dk.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Indstillinger",
 	"settings.camera": "Kamera",
@@ -190,6 +191,7 @@
 	"moderator.muteAudio": null,
 	"moderator.muteVideo": null,
 	"moderator.muteScreenSharing": null,
+	"moderator.stopScreenSharing": null,
 
 	"unsupportedBrowser.titleUnsupportedBrowser": null,
 	"unsupportedBrowser.titlewebrtcUnavailable": null,
diff --git a/app/src/translations/el.json b/app/src/translations/el.json
index f523948..87a37c4 100644
--- a/app/src/translations/el.json
+++ b/app/src/translations/el.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Ρυθμίσεις",
 	"settings.camera": "Κάμερα",
@@ -190,7 +191,8 @@
 	"moderator.muteAudio": null,
 	"moderator.muteVideo": null,
 	"moderator.muteScreenSharing": null,
-
+	"moderator.stopScreenSharing": null,
+	
 	"unsupportedBrowser.titleUnsupportedBrowser": null,
 	"unsupportedBrowser.titlewebrtcUnavailable": null,
 	"unsupportedBrowser.bodyText": null
diff --git a/app/src/translations/en.json b/app/src/translations/en.json
index b2db17e..fbbd13b 100644
--- a/app/src/translations/en.json
+++ b/app/src/translations/en.json
@@ -119,6 +119,7 @@
 	"label.addVideo": "Add video",
 	"label.promoteAllPeers": "Promote all",
 	"label.moreActions": "More actions",
+	"label.version": "Version",
 
 	"settings.settings": "Settings",
 	"settings.camera": "Camera",
@@ -190,6 +191,7 @@
 	"moderator.muteAudio": "Moderator muted your audio",
 	"moderator.muteVideo": "Moderator muted your video",
 	"moderator.muteScreenSharing": "Moderator muted your screen sharing",
+	"moderator.stopScreenSharing": "Moderator stopped your screen sharing",
 
 	"unsupportedBrowser.titleUsnsupportedBrowser": "Detected unsupported browser!",
 	"unsupportedBrowser.titlewebrtcUnavailable": "Required functionality not available in your browser!",
diff --git a/app/src/translations/es.json b/app/src/translations/es.json
index ce7cd47..6d20c1f 100644
--- a/app/src/translations/es.json
+++ b/app/src/translations/es.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Ajustes",
 	"settings.camera": "Cámara",
@@ -190,6 +191,7 @@
 	"moderator.muteAudio": null,
 	"moderator.muteVideo": null,
 	"moderator.muteScreenSharing": null,
+	"moderator.stopScreenSharing": null,
 
 	"unsupportedBrowser.titleUnsupportedBrowser": null,
 	"unsupportedBrowser.titlewebrtcUnavailable": null,
diff --git a/app/src/translations/fr.json b/app/src/translations/fr.json
index 76b1238..4f80ebe 100644
--- a/app/src/translations/fr.json
+++ b/app/src/translations/fr.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Paramètres",
 	"settings.camera": "Caméra",
@@ -189,6 +190,7 @@
 	"moderator.muteAudio": null,
 	"moderator.muteVideo": null,
 	"moderator.muteScreenSharing": null,
+	"moderator.stopScreenSharing": null,
 
 	"unsupportedBrowser.titleUnsupportedBrowser": null,
 	"unsupportedBrowser.titlewebrtcUnavailable": null,
diff --git a/app/src/translations/hr.json b/app/src/translations/hr.json
index 0547b6b..b62ac73 100644
--- a/app/src/translations/hr.json
+++ b/app/src/translations/hr.json
@@ -119,6 +119,7 @@
 	"label.addVideo": "Dodaj video",
 	"label.promoteAllPeers": "Promoviraj sve",
 	"label.moreActions": "Više akcija",
+	"label.version": null,
 
 	"settings.settings":  "Postavke",
 	"settings.camera": "Kamera",
@@ -190,6 +191,7 @@
 	"moderator.muteAudio": "Moderator je utišao tvoj zvuk",
 	"moderator.muteVideo": "Moderator je zaustavio tvoj video",
 	"moderator.muteScreenSharing": null,
+	"moderator.stopScreenSharing": null,
 
 	"unsupportedBrowser.titleUnsupportedBrowser": null,
 	"unsupportedBrowser.titlewebrtcUnavailable": null,
diff --git a/app/src/translations/hu.json b/app/src/translations/hu.json
index 1e41875..124e0e1 100644
--- a/app/src/translations/hu.json
+++ b/app/src/translations/hu.json
@@ -66,7 +66,7 @@
 	"room.browsePeersSpotlight": "Résztvevők böngészése",
 	"room.stopAllScreenSharing": "Összes képernyőmegosztás leállítása",
 
-	"me.mutedPTT": "Némítva vagy, ha beszélnél nyomd le a szóköz billentyűt",
+	"me.mutedPTT": "Némítva vagy, ha beszélnél nyomd le a SZÓKÖZ billentyűt",
 
 	"roles.gotRole": "{role} szerepet kaptál",
 	"roles.lostRole": "Elvesztetted a {role} szerepet",
@@ -119,6 +119,7 @@
 	"label.addVideo": "Videó hozzáadása",
 	"label.promoteAllPeers": "Mindenkit beengedek",
 	"label.moreActions": "További műveletek",
+	"label.version": "Verzió",
 
 	"settings.settings": "Beállítások",
 	"settings.camera": "Kamera",
@@ -189,10 +190,10 @@
 	"moderator.clearFiles": "A moderátor kiürítette a file megosztás történelmet",
 	"moderator.muteAudio": "A moderátor elnémította a hangod",
 	"moderator.muteVideo": "A moderátor elnémította a videód",
-	"moderator.muteScreenSharing": "A moderátor leállította képernyőmegosztásod",
+	"moderator.muteScreenSharing": "A moderátor szünetelteti képernyőmegosztásod",
+	"moderator.stopScreenSharing": "A moderátor leállította a képernyőmegosztásod",
 
 	"unsupportedBrowser.titleUnsupportedBrowser": "A bőngésző verziód sajnos nem támogatott! :-(",
 	"unsupportedBrowser.titlewebrtcUnavailable": "A böngésződ egy szükséges funkciója nem elérhető!",
 	"unsupportedBrowser.bodyText": "Kérlek frissítsd a böngésződ, válts másik böngészőre, vagy ellenőrizd a böngésződ beállításait! Támogatott böngészők:"
-
 }
diff --git a/app/src/translations/it.json b/app/src/translations/it.json
index 9512bba..4e092c1 100644
--- a/app/src/translations/it.json
+++ b/app/src/translations/it.json
@@ -119,6 +119,7 @@
 	"label.addVideo": "Aggiungi video",
 	"label.promoteAllPeers": "Promuovi tutti",
 	"label.moreActions": "Altre azioni",
+	"label.version": null,
 
 	"settings.settings": "Impostazioni",
 	"settings.camera": "Videocamera",
@@ -190,9 +191,9 @@
 	"moderator.muteAudio": "Il moderatore ha mutato il tuo audio",
 	"moderator.muteVideo": "Il moderatore ha fermato il tuo video",
 	"moderator.muteScreenSharing": null,
+	"moderator.stopScreenSharing": null,
 
 	"unsupportedBrowser.titleUnsupportedBrowser": null,
 	"unsupportedBrowser.titlewebrtcUnavailable": null,
 	"unsupportedBrowser.bodyText": null
 }
-
diff --git a/app/src/translations/lv.json b/app/src/translations/lv.json
index c71a9e8..9f62d12 100644
--- a/app/src/translations/lv.json
+++ b/app/src/translations/lv.json
@@ -116,6 +116,7 @@
 	"label.advanced": "Advancēts",
 	"label.addVideo": "Pievienot video",
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Iestatījumi",
 	"settings.camera": "Kamera",
@@ -184,6 +185,7 @@
 	"moderator.muteAudio": "Moderators noklusināja jūsu mikrofonu",
 	"moderator.muteVideo": "Moderators atslēdza jūsu kameru",
 	"moderator.muteScreenSharing": null,
+	"moderator.stopScreenSharing": null,
 
 	"unsupportedBrowser.titleUnsupportedBrowser": null,
 	"unsupportedBrowser.titlewebrtcUnavailable": null,
diff --git a/app/src/translations/nb.json b/app/src/translations/nb.json
index f98a242..8cd31a9 100644
--- a/app/src/translations/nb.json
+++ b/app/src/translations/nb.json
@@ -119,6 +119,7 @@
 	"label.addVideo": "Legg til video",
 	"label.promoteAllPeers": "Slipp inn alle",
 	"label.moreActions": "Flere handlinger",
+	"label.version": null,
 
 	"settings.settings": "Innstillinger",
 	"settings.camera": "Kamera",
@@ -190,6 +191,7 @@
 	"moderator.muteAudio": "Moderator mutet lyden din",
 	"moderator.muteVideo": "Moderator mutet videoen din",
 	"moderator.muteScreenSharing": null,
+	"moderator.stopScreenSharing": null,
 	
 	"unsupportedBrowser.titleUnsupportedBrowser": null,
 	"unsupportedBrowser.titlewebrtcUnavailable": null,
diff --git a/app/src/translations/pl.json b/app/src/translations/pl.json
index d63e9d3..c5baa68 100644
--- a/app/src/translations/pl.json
+++ b/app/src/translations/pl.json
@@ -119,6 +119,7 @@
 	"label.addVideo": "Dodaj wideo",
 	"label.promoteAllPeers": "Wpuść wszystkich",
 	"label.moreActions": "Więcej akcji",
+	"label.version": null,
 
 	"settings.settings": "Ustawienia",
 	"settings.camera": "Kamera",
@@ -190,6 +191,7 @@
 	"moderator.muteAudio": "Moderator wyciszył audio",
 	"moderator.muteVideo": "Moderator wyciszył twoje video",
 	"moderator.muteScreenSharing": null,
+	"moderator.stopScreenSharing": null,
 
 	"unsupportedBrowser.titleUnsupportedBrowser": null,
 	"unsupportedBrowser.titlewebrtcUnavailable": null,
diff --git a/app/src/translations/pt.json b/app/src/translations/pt.json
index a3d3ab9..1fb0103 100644
--- a/app/src/translations/pt.json
+++ b/app/src/translations/pt.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Definições",
 	"settings.camera": "Camera",
@@ -190,6 +191,7 @@
 	"moderator.muteAudio": null,
 	"moderator.muteVideo": null,
 	"moderator.muteScreenSharing": null,
+	"moderator.stopScreenSharing": null,
 
 	"unsupportedBrowser.titleUnsupportedBrowser": null,
 	"unsupportedBrowser.titlewebrtcUnavailable": null,
diff --git a/app/src/translations/ro.json b/app/src/translations/ro.json
index 483f44d..9520474 100644
--- a/app/src/translations/ro.json
+++ b/app/src/translations/ro.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Setări",
 	"settings.camera": "Cameră video",
@@ -190,6 +191,7 @@
 	"moderator.muteAudio": null,
 	"moderator.muteVideo": null,
 	"moderator.muteScreenSharing": null,
+	"moderator.stopScreenSharing": null,
 
 	"unsupportedBrowser.titleUnsupportedBrowser": null,
 	"unsupportedBrowser.titlewebrtcUnavailable": null,
diff --git a/app/src/translations/tr.json b/app/src/translations/tr.json
index 110585c..f3fa20d 100644
--- a/app/src/translations/tr.json
+++ b/app/src/translations/tr.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Ayarlar",
 	"settings.camera": "Kamera",
@@ -181,7 +182,13 @@
 
 	"devices.cameraDisconnected": "Kamera bağlı değil",
 	"devices.cameraError": "Kameranıza erişilirken bir hata oluştu",
+	
+	"moderator.clearChat": null,
+	"moderator.clearFiles": null,
+	"moderator.muteAudio": null,
+	"moderator.muteVideo": null,
 	"moderator.muteScreenSharing": null,
+	"moderator.stopScreenSharing": null,
 
 	"unsupportedBrowser.titleUnsupportedBrowser": null,
 	"unsupportedBrowser.titlewebrtcUnavailable": null,
diff --git a/app/src/translations/tw.json b/app/src/translations/tw.json
index cc87968..103d4ce 100644
--- a/app/src/translations/tw.json
+++ b/app/src/translations/tw.json
@@ -118,6 +118,7 @@
 	"label.addVideo": "新增視訊",
 	"label.promoteAllPeers": "提升全部",
 	"label.moreActions": "更多",
+	"label.version": null,
 
 	"settings.settings": "設置",
 	"settings.camera": "視訊來源",
@@ -189,6 +190,7 @@
 	"moderator.muteAudio": "您已被管理員靜音",
 	"moderator.muteVideo": "您的視訊已被管理員關閉",
 	"moderator.muteScreenSharing": null,
+	"moderator.stopScreenSharing": null,
 
 	"unsupportedBrowser.titleUnsupportedBrowser": null,
 	"unsupportedBrowser.titlewebrtcUnavailable": null,
diff --git a/app/src/translations/uk.json b/app/src/translations/uk.json
index 61708e6..fc9b0a6 100644
--- a/app/src/translations/uk.json
+++ b/app/src/translations/uk.json
@@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,
 
 	"settings.settings": "Налаштування",
 	"settings.camera": "Камера",
@@ -190,6 +191,7 @@
 	"moderator.muteAudio": null,
 	"moderator.muteVideo": null,
 	"moderator.muteScreenSharing": null,
+	"moderator.stopScreenSharing": null,
 	
 	"unsupportedBrowser.titleUnsupportedBrowser": null,
 	"unsupportedBrowser.titlewebrtcUnavailable": null,
diff --git a/app/src/utils.js b/app/src/utils.js
index 1fba8b3..21339fe 100644
--- a/app/src/utils.js
+++ b/app/src/utils.js
@@ -3,17 +3,35 @@
  * after the given amount of milliseconds has passed since
  * the last time the callback function was called.
  */
-export const idle = (callback, delay) => 
+export const idle = (callback, delay) =>
 {
 	let handle;
 
-	return () => 
+	return () =>
 	{
-		if (handle) 
+		if (handle)
 		{
 			clearTimeout(handle);
 		}
 
 		handle = setTimeout(callback, delay);
 	};
-};
\ No newline at end of file
+};
+
+/**
+ * Error produced when a socket request has a timeout.
+ */
+export class SocketTimeoutError extends Error
+{
+	constructor(message)
+	{
+		super(message);
+
+		this.name = 'SocketTimeoutError';
+
+		if (Error.hasOwnProperty('captureStackTrace')) // Just in V8.
+			Error.captureStackTrace(this, SocketTimeoutError);
+		else
+			this.stack = (new Error(message)).stack;
+	}
+}
\ No newline at end of file
diff --git a/server/.eslintrc.json b/server/.eslintrc.json
index d98852a..b4a49d1 100644
--- a/server/.eslintrc.json
+++ b/server/.eslintrc.json
@@ -106,6 +106,12 @@
 		"no-invalid-regexp": 2,
 		"no-invalid-this": 2,
 		"no-irregular-whitespace": 2,
+		"no-trailing-spaces": [
+			"error",
+			{
+				"ignoreComments": true
+			}
+		],
 		"no-lonely-if": 2,
 		"no-mixed-operators": 2,
 		"no-mixed-spaces-and-tabs": 2,
diff --git a/server/config/config.example.js b/server/config/config.example.js
index e08f910..6ca4a27 100644
--- a/server/config/config.example.js
+++ b/server/config/config.example.js
@@ -276,6 +276,10 @@ module.exports =
 	// maxUsersPerRoom    : 20,
 	// Room size before spreading to new router
 	routerScaleSize      : 40,
+	// Socket timout value
+	requestTimeout       : 20000,
+	// Socket retries when timeout
+	requestRetries       : 3,
 	// Mediasoup settings
 	mediasoup            :
 	{
diff --git a/server/lib/Peer.js b/server/lib/Peer.js
index 8e11ca2..5752d3e 100644
--- a/server/lib/Peer.js
+++ b/server/lib/Peer.js
@@ -83,9 +83,9 @@ class Peer extends EventEmitter
 			{
 				if (this.closed)
 					return;
-	
+
 				logger.debug('"disconnect" event [id:%s]', this.id);
-	
+
 				this.close();
 			});
 		}
@@ -208,7 +208,7 @@ class Peer extends EventEmitter
 			const oldDisplayName = this._displayName;
 
 			this._displayName = displayName;
-			
+
 			this.emit('displayNameChanged', { oldDisplayName });
 		}
 	}
@@ -225,7 +225,7 @@ class Peer extends EventEmitter
 			const oldPicture = this._picture;
 
 			this._picture = picture;
-			
+
 			this.emit('pictureChanged', { oldPicture });
 		}
 	}
diff --git a/server/lib/Room.js b/server/lib/Room.js
index f110327..df46f0e 100644
--- a/server/lib/Room.js
+++ b/server/lib/Room.js
@@ -3,6 +3,7 @@ const AwaitQueue = require('awaitqueue');
 const axios = require('axios');
 const Logger = require('./Logger');
 const Lobby = require('./Lobby');
+const { SocketTimeoutError } = require('./errors');
 const { v4: uuidv4 } = require('uuid');
 const jwt = require('jsonwebtoken');
 const userRoles = require('../userRoles');
@@ -492,7 +493,7 @@ class Room extends EventEmitter
 				peer.socket.handshake.session.save();
 
 				let turnServers;
-		
+
 				if ('turnAPIURI' in config)
 				{
 					try
@@ -506,7 +507,7 @@ class Room extends EventEmitter
 									'ip'      : peer.socket.request.connection.remoteAddress
 								}
 							});
-			
+
 						turnServers = [ {
 							urls       : data.uris,
 							username   : data.username,
@@ -517,7 +518,7 @@ class Room extends EventEmitter
 					{
 						if ('backupTurnServers' in config)
 							turnServers = config.backupTurnServers;
-			
+
 						logger.error('_peerJoining() | error on REST turn [error:"%o"]', error);
 					}
 				}
@@ -525,7 +526,7 @@ class Room extends EventEmitter
 				{
 					turnServers = config.backupTurnServers;
 				}
-		
+
 				this._notification(peer.socket, 'roomReady', { turnServers });
 			}
 		})
@@ -778,7 +779,7 @@ class Room extends EventEmitter
 				// initiate mediasoup Transports and be ready when he later joins.
 
 				const { forceTcp, producing, consuming } = request.data;
-				
+
 				const webRtcTransportOptions =
 				{
 					...config.mediasoup.webRtcTransport,
@@ -1186,7 +1187,7 @@ class Room extends EventEmitter
 					throw new Error('peer not authorized');
 
 				const { chatMessage } = request.data;
-	
+
 				this._chatHistory.push(chatMessage);
 
 				// Spread to others
@@ -1205,7 +1206,7 @@ class Room extends EventEmitter
 			{
 				if (!this._hasPermission(peer, MODERATE_CHAT))
 					throw new Error('peer not authorized');
-	
+
 				this._chatHistory = [];
 
 				// Spread to others
@@ -1258,7 +1259,7 @@ class Room extends EventEmitter
 			case 'setAccessCode':
 			{
 				const { accessCode } = request.data;
-	
+
 				this._accessCode = accessCode;
 
 				// Spread to others
@@ -1278,7 +1279,7 @@ class Room extends EventEmitter
 			case 'setJoinByAccessCode':
 			{
 				const { joinByAccessCode } = request.data;
-	
+
 				this._joinByAccessCode = joinByAccessCode;
 
 				// Spread to others
@@ -1327,7 +1328,7 @@ class Room extends EventEmitter
 					throw new Error('peer not authorized');
 
 				const { magnetUri } = request.data;
-	
+
 				this._fileHistory.push({ peerId: peer.id, magnetUri: magnetUri });
 
 				// Spread to others
@@ -1346,7 +1347,7 @@ class Room extends EventEmitter
 			{
 				if (!this._hasPermission(peer, MODERATE_FILES))
 					throw new Error('peer not authorized');
-	
+
 				this._fileHistory = [];
 
 				// Spread to others
@@ -1759,9 +1760,9 @@ class Room extends EventEmitter
 				if (called)
 					return;
 				called = true;
-				callback(new Error('Request timeout.'));
+				callback(new SocketTimeoutError('Request timed out'));
 			},
-			10000
+			config.requestTimeout || 20000
 		);
 
 		return (...args) =>
@@ -1775,7 +1776,7 @@ class Room extends EventEmitter
 		};
 	}
 
-	_request(socket, method, data = {})
+	_sendRequest(socket, method, data = {})
 	{
 		return new Promise((resolve, reject) =>
 		{
@@ -1797,6 +1798,33 @@ class Room extends EventEmitter
 		});
 	}
 
+	async _request(socket, method, data)
+	{
+		logger.debug('_request() [method:"%s", data:"%o"]', method, data);
+
+		const {
+			requestRetries = 3
+		} = config;
+
+		for (let tries = 0; tries < requestRetries; tries++)
+		{
+			try
+			{
+				return await this._sendRequest(socket, method, data);
+			}
+			catch (error)
+			{
+				if (
+					error instanceof SocketTimeoutError &&
+					tries < requestRetries
+				)
+					logger.warn('_request() | timeout, retrying [attempt:"%s"]', tries);
+				else
+					throw error;
+			}
+		}
+	}
+
 	_notification(socket, method, data = {}, broadcast = false, includeSender = false)
 	{
 		if (broadcast)
@@ -1879,7 +1907,7 @@ class Room extends EventEmitter
 
 		for (const routerId of this._mediasoupRouters.keys())
 		{
-			const routerLoad = 
+			const routerLoad =
 				Object.values(this._peers).filter((peer) => peer.routerId === routerId).length;
 
 			if (routerLoad < load)
diff --git a/server/lib/errors.js b/server/lib/errors.js
new file mode 100644
index 0000000..379838d
--- /dev/null
+++ b/server/lib/errors.js
@@ -0,0 +1,22 @@
+/**
+ * Error produced when a socket request has a timeout.
+ */
+class SocketTimeoutError extends Error
+{
+	constructor(message)
+	{
+		super(message);
+
+		this.name = 'SocketTimeoutError';
+
+		if (Error.hasOwnProperty('captureStackTrace')) // Just in V8.
+			Error.captureStackTrace(this, SocketTimeoutError);
+		else
+			this.stack = (new Error(message)).stack;
+	}
+}
+
+module.exports =
+{
+	SocketTimeoutError
+};
\ No newline at end of file