diff --git a/conference.js b/conference.js
index c20bb505d..2e399827a 100644
--- a/conference.js
+++ b/conference.js
@@ -125,12 +125,11 @@ function muteLocalVideo (muted) {
 function hangup (requestFeedback = false) {
     APP.conference._room.leave().then(() => {
         connection.disconnect();
-        let promise = Promise.resolve();
-
         if (requestFeedback) {
-            promise = APP.UI.requestFeedback();
+            return APP.UI.requestFeedback();
+        } else {
+            return Promise.resolve();
         }
-        return promise;
     }).then(function () {
         if (!config.enableWelcomePage) {
             return;