diff --git a/core/src/apps/management/apply_flags.py b/core/src/apps/management/apply_flags.py
index 087971e7f..0f7b48b2d 100644
--- a/core/src/apps/management/apply_flags.py
+++ b/core/src/apps/management/apply_flags.py
@@ -1,7 +1,12 @@
+import storage.device
 from storage.device import set_flags
 from trezor.messages.Success import Success
 
+import wire
+
 
 async def apply_flags(ctx, msg):
+    if not storage.is_initialized():
+        raise wire.NotInitialized("Device is not initialized")
     set_flags(msg.flags)
     return Success(message="Flags applied")
diff --git a/core/src/apps/management/apply_settings.py b/core/src/apps/management/apply_settings.py
index 31d2f4cad..4f2aa88f4 100644
--- a/core/src/apps/management/apply_settings.py
+++ b/core/src/apps/management/apply_settings.py
@@ -12,6 +12,8 @@ if False:
 
 
 async def apply_settings(ctx: wire.Context, msg: ApplySettings):
+    if not storage.is_initialized():
+        raise wire.NotInitialized("Device is not initialized")
     if (
         msg.homescreen is None
         and msg.label is None
diff --git a/core/src/apps/management/get_next_u2f_counter.py b/core/src/apps/management/get_next_u2f_counter.py
index 81735cb41..0389bb9ab 100644
--- a/core/src/apps/management/get_next_u2f_counter.py
+++ b/core/src/apps/management/get_next_u2f_counter.py
@@ -11,6 +11,8 @@ from apps.common.confirm import require_confirm
 async def get_next_u2f_counter(
     ctx: wire.Context, msg: GetNextU2FCounter
 ) -> NextU2FCounter:
+    if not storage.is_initialized():
+        raise wire.NotInitialized("Device is not initialized")
     text = Text("Get next U2F counter", ui.ICON_CONFIG)
     text.normal("Do you really want to")
     text.bold("increase and retrieve")
diff --git a/core/src/apps/management/set_u2f_counter.py b/core/src/apps/management/set_u2f_counter.py
index 98a52f584..e4f9cc339 100644
--- a/core/src/apps/management/set_u2f_counter.py
+++ b/core/src/apps/management/set_u2f_counter.py
@@ -9,6 +9,8 @@ from apps.common.confirm import require_confirm
 
 
 async def set_u2f_counter(ctx: wire.Context, msg: SetU2FCounter) -> Success:
+    if not storage.is_initialized():
+        raise wire.NotInitialized("Device is not initialized")
     if msg.u2f_counter is None:
         raise wire.ProcessError("No value provided")
 
diff --git a/core/src/apps/webauthn/add_resident_credential.py b/core/src/apps/webauthn/add_resident_credential.py
index 83c225a5d..8fe1b0d54 100644
--- a/core/src/apps/webauthn/add_resident_credential.py
+++ b/core/src/apps/webauthn/add_resident_credential.py
@@ -1,3 +1,4 @@
+import storage
 from trezor import ui, wire
 from trezor.messages.Success import Success
 from trezor.messages.WebAuthnAddResidentCredential import WebAuthnAddResidentCredential
@@ -30,6 +31,8 @@ class ConfirmAddCredential(ConfirmInfo):
 async def add_resident_credential(
     ctx: wire.Context, msg: WebAuthnAddResidentCredential
 ) -> Success:
+    if not storage.is_initialized():
+        raise wire.NotInitialized("Device is not initialized")
     if not msg.credential_id:
         raise wire.ProcessError("Missing credential ID parameter.")
 
diff --git a/core/src/apps/webauthn/remove_resident_credential.py b/core/src/apps/webauthn/remove_resident_credential.py
index 28b74a89b..e03c23756 100644
--- a/core/src/apps/webauthn/remove_resident_credential.py
+++ b/core/src/apps/webauthn/remove_resident_credential.py
@@ -32,6 +32,8 @@ class ConfirmRemoveCredential(ConfirmInfo):
 async def remove_resident_credential(
     ctx: wire.Context, msg: WebAuthnRemoveResidentCredential
 ) -> Success:
+    if not storage.is_initialized():
+        raise wire.NotInitialized("Device is not initialized")
     if msg.index is None:
         raise wire.ProcessError("Missing credential index parameter.")
 
diff --git a/tests/upgrade_tests/test_firmware_upgrades.py b/tests/upgrade_tests/test_firmware_upgrades.py
index 8dd171d95..274574b4e 100644
--- a/tests/upgrade_tests/test_firmware_upgrades.py
+++ b/tests/upgrade_tests/test_firmware_upgrades.py
@@ -212,6 +212,14 @@ def test_upgrade_shamir_recovery(gen, tag):
 def test_upgrade_u2f(gen, tag):
     """Check U2F counter stayed the same after an upgrade."""
     with EmulatorWrapper(gen, tag) as emu:
+        debuglink.load_device_by_mnemonic(
+            emu.client,
+            mnemonic=MNEMONIC,
+            pin="",
+            passphrase_protection=False,
+            label=LABEL,
+        )
+
         success = fido.set_counter(emu.client, 10)
         assert "U2F counter set" in success