diff --git a/conference.js b/conference.js
index b0edba985..07a218785 100644
--- a/conference.js
+++ b/conference.js
@@ -202,8 +202,20 @@ function muteLocalVideo (muted) {
 
 /**
  * Check if the welcome page is enabled and redirects to it.
+ * If requested show a thank you dialog before that.
+ * @param {boolean} showThankYou whether we should show a thank you dialog
  */
-function maybeRedirectToWelcomePage() {
+function maybeRedirectToWelcomePage(showThankYou) {
+
+    if (showThankYou) {
+        APP.UI.messageHandler.openMessageDialog(
+            null, null, null,
+            APP.translation.translateString(
+                "dialog.thankYou", {appName:interfaceConfig.APP_NAME}
+            )
+        );
+    }
+
     if (!config.enableWelcomePage) {
         return;
     }
diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index fb208588a..1b6c304ac 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -1130,14 +1130,9 @@ UI.requestFeedback = function () {
                 }
             } else {
                 // If the feedback functionality isn't enabled we show a thank
-                // you dialog.
-                messageHandler.openMessageDialog(
-                    null, null, null,
-                    APP.translation.translateString(
-                        "dialog.thankYou", {appName:interfaceConfig.APP_NAME}
-                    )
-                );
-                resolve();
+                // you dialog. Signaling it (true), so the caller
+                // of requestFeedback can act on it
+                resolve(true);
             }
         });
 };