diff --git a/js/gdm/util.js b/js/gdm/util.js
index 6075e660f..cae3e1b23 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -164,6 +164,7 @@ const ShellUserVerifier = new Lang.Class({
 
     answerQuery: function(serviceName, answer) {
         if (!this._userVerifier.hasPendingMessages) {
+            this._clearMessageQueue();
             this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
         } else {
             let signalId = this._userVerifier.connect('no-more-messages',