diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 1835347838..a03119f37c 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -157,6 +157,11 @@ export default class DeviceListener {
             }
             return;
         } else if (await cli.secretStorageKeyNeedsUpgrade()) {
+            if (this._dismissedThisDeviceToast) {
+                ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
+                return;
+            }
+
             // FIXME: do we a different message?
             ToastStore.sharedInstance().addOrReplaceToast({
                 key: THIS_DEVICE_TOAST_KEY,