diff --git a/package-lock.json b/package-lock.json
index 34170b68..50d056e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "mirotalksfu",
-    "version": "1.9.03",
+    "version": "1.9.04",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "mirotalksfu",
-            "version": "1.9.03",
+            "version": "1.9.04",
             "license": "AGPL-3.0",
             "dependencies": {
                 "@aws-sdk/client-s3": "^3.848.0",
diff --git a/package.json b/package.json
index c8a5ef74..428d9475 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mirotalksfu",
-    "version": "1.9.03",
+    "version": "1.9.04",
     "description": "WebRTC SFU browser-based video calls",
     "main": "Server.js",
     "scripts": {
diff --git a/public/js/Brand.js b/public/js/Brand.js
index 25e2f94a..04c48688 100644
--- a/public/js/Brand.js
+++ b/public/js/Brand.js
@@ -76,7 +76,7 @@ let BRAND = {
     },
     about: {
         imageUrl: '../images/mirotalk-logo.gif',
-        title: '<strong>WebRTC SFU v1.9.03</strong>',
+        title: '<strong>WebRTC SFU v1.9.04</strong>',
         html: `
             <button 
                 id="support-button" 
diff --git a/public/js/Room.js b/public/js/Room.js
index 3d9a3f6c..b040de29 100644
--- a/public/js/Room.js
+++ b/public/js/Room.js
@@ -11,7 +11,7 @@ if (location.href.substr(0, 5) !== 'https') location.href = 'https' + location.h
  * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.9.03
+ * @version 1.9.04
  *
  */
 
@@ -5465,7 +5465,7 @@ function showAbout() {
         position: 'center',
         imageUrl: BRAND.about?.imageUrl && BRAND.about.imageUrl.trim() !== '' ? BRAND.about.imageUrl : image.about,
         customClass: { image: 'img-about' },
-        title: BRAND.about?.title && BRAND.about.title.trim() !== '' ? BRAND.about.title : 'WebRTC SFU v1.9.03',
+        title: BRAND.about?.title && BRAND.about.title.trim() !== '' ? BRAND.about.title : 'WebRTC SFU v1.9.04',
         html: `
             <br />
             <div id="about">
diff --git a/public/js/RoomClient.js b/public/js/RoomClient.js
index 7e87c88a..33a26c1e 100644
--- a/public/js/RoomClient.js
+++ b/public/js/RoomClient.js
@@ -9,7 +9,7 @@
  * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.9.03
+ * @version 1.9.04
  *
  */
 
@@ -6181,7 +6181,14 @@ class RoomClient {
     // RECORDING
     // ####################################################
 
+    toggleVideoAudioTabs(disabled = false){
+        if (disabled) tabRoomBtn.click();
+        tabAudioDevicesBtn.disabled = disabled;
+        tabVideoDevicesBtn.disabled = disabled;
+    }
+
     handleRecordingError(error, popupLog = true) {
+        this.toggleVideoAudioTabs(false);
         console.error('Recording error', error);
         if (popupLog) this.userLog('error', error, 'top-end', 6000);
     }
@@ -6198,6 +6205,9 @@ class RoomClient {
     startRecording() {
         recordedBlobs = [];
 
+        // Toggle Video/Audio tabs
+        this.toggleVideoAudioTabs(true);
+
         // Get supported MIME types and set options
         const supportedMimeTypes = this.getSupportedMimeTypes();
         console.log('MediaRecorder supported options', supportedMimeTypes);
@@ -6604,6 +6614,7 @@ class RoomClient {
 
     stopRecording() {
         if (this.mediaRecorder) {
+            this.toggleVideoAudioTabs(false);
             this._isRecording = false;
             this.mediaRecorder.stop();
             this.mediaRecorder = null;