diff --git a/js/gdm/util.js b/js/gdm/util.js
index 006841f45..22cbe4733 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -719,10 +719,10 @@ var ShellUserVerifier = class extends Signals.EventEmitter {
                 this._disconnectSignals();
                 await this._handlePendingMessages();
                 this._cancelAndReset();
+            } else {
+                await this._handlePendingMessages();
+                this._retry(serviceName);
             }
-
-            await this._handlePendingMessages();
-            this._retry(serviceName);
         } catch (e) {
             if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
                 logError(e);