diff --git a/package-lock.json b/package-lock.json
index e321958e..b0bbbb31 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "mirotalksfu",
-    "version": "1.8.89",
+    "version": "1.8.90",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "mirotalksfu",
-            "version": "1.8.89",
+            "version": "1.8.90",
             "license": "AGPL-3.0",
             "dependencies": {
                 "@aws-sdk/client-s3": "^3.844.0",
diff --git a/package.json b/package.json
index a4396ed8..ae87cae6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mirotalksfu",
-    "version": "1.8.89",
+    "version": "1.8.90",
     "description": "WebRTC SFU browser-based video calls",
     "main": "Server.js",
     "scripts": {
diff --git a/public/js/Brand.js b/public/js/Brand.js
index dfb661e7..9d404a2f 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.8.89</strong>',
+        title: '<strong>WebRTC SFU v1.8.90</strong>',
         html: `
             <button 
                 id="support-button" 
diff --git a/public/js/Room.js b/public/js/Room.js
index aa2336fd..4203b388 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.8.89
+ * @version 1.8.90
  *
  */
 
@@ -1787,7 +1787,7 @@ function handleButtons() {
         isButtonsBarOver = false;
     };
     exitButton.onclick = () => {
-        rc.exitRoom();
+        leaveRoom();
     };
     shareButton.onclick = () => {
         shareRoom(true);
@@ -3608,11 +3608,6 @@ function handleRoomClientEvents() {
         if (rc.isRecording() || recordingStatus.innerText != '0s') {
             rc.saveRecording('Room event: Client save recording before to exit');
         }
-        if (survey && survey.enabled) {
-            leaveFeedback();
-        } else {
-            redirectOnLeave();
-        }
     });
 }
 
@@ -3620,11 +3615,21 @@ function handleRoomClientEvents() {
 // UTILITY
 // ####################################################
 
+function leaveRoom() {
+    survey && survey.enabled
+        ? leaveFeedback()
+        : redirectOnLeave();
+}
+
 function leaveFeedback() {
     Swal.fire({
         allowOutsideClick: false,
         allowEscapeKey: false,
         showDenyButton: true,
+        showCancelButton: true,
+        confirmButtonColor: 'green',
+        denyButtonColor: 'red',
+        cancelButtonColor: 'gray',
         background: swalBackground,
         imageUrl: image.feedback,
         position: 'top',
@@ -3632,18 +3637,22 @@ function leaveFeedback() {
         text: 'Do you want to rate your MiroTalk experience?',
         confirmButtonText: `Yes`,
         denyButtonText: `No`,
+        cancelButtonText: `Cancel`,
         showClass: { popup: 'animate__animated animate__fadeInDown' },
         hideClass: { popup: 'animate__animated animate__fadeOutUp' },
     }).then((result) => {
         if (result.isConfirmed) {
+            endRoomSession();
             openURL(survey.url);
-        } else {
+        } else if (result.isDenied) {
+            rc.exitRoom();
             redirectOnLeave();
         }
     });
 }
 
 function redirectOnLeave() {
+    endRoomSession();
     redirect && redirect.enabled ? openURL(redirect.url) : openURL('/newroom');
 }
 
@@ -5510,7 +5519,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.8.89',
+        title: BRAND.about?.title && BRAND.about.title.trim() !== '' ? BRAND.about.title : 'WebRTC SFU v1.8.90',
         html: `
             <br />
             <div id="about">
diff --git a/public/js/RoomClient.js b/public/js/RoomClient.js
index f593efaa..376d1879 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.8.89
+ * @version 1.8.90
  *
  */