diff --git a/core/src/apps/workflow_handlers.py b/core/src/apps/workflow_handlers.py
index c7ff7ba477..4f633e6156 100644
--- a/core/src/apps/workflow_handlers.py
+++ b/core/src/apps/workflow_handlers.py
@@ -106,17 +106,17 @@ def _find_message_handler_module(msg_type: int) -> str:
     if msg_type == MessageType.GetFirmwareHash:
         return "apps.misc.get_firmware_hash"
 
-    # When promoting the Nostr app to production-level
-    # and removing the "if" guard don't forget to also remove
-    # the corresponding guards (PYOPT == '0') in Sconscript.*
-    if __debug__:
-        # nostr
-        if msg_type == MessageType.NostrGetPubkey:
-            return "apps.nostr.get_pubkey"
-        if msg_type == MessageType.NostrSignEvent:
-            return "apps.nostr.sign_event"
-
     if not utils.BITCOIN_ONLY:
+        # When promoting the Nostr app to production-level
+        # and removing the "if" guard don't forget to also remove
+        # the corresponding guards (PYOPT == '0') in Sconscript.*
+        if __debug__:
+            # nostr
+            if msg_type == MessageType.NostrGetPubkey:
+                return "apps.nostr.get_pubkey"
+            if msg_type == MessageType.NostrSignEvent:
+                return "apps.nostr.sign_event"
+
         if msg_type == MessageType.SetU2FCounter:
             return "apps.management.set_u2f_counter"
         if msg_type == MessageType.GetNextU2FCounter: