diff --git a/js/ui/components/keyring.js b/js/ui/components/keyring.js
index dfa7cc007..ef53c0b42 100644
--- a/js/ui/components/keyring.js
+++ b/js/ui/components/keyring.js
@@ -219,6 +219,7 @@ const KeyringPrompter = new Lang.Class({
     },
 
     disable: function() {
+        this._prompter.unregister(false);
         Gio.DBus.session.unown_name(this._dbusId);
     }
 });