diff --git a/core/embed/projects/bootloader/main.c b/core/embed/projects/bootloader/main.c
index bd44169fcb..ee258445d5 100644
--- a/core/embed/projects/bootloader/main.c
+++ b/core/embed/projects/bootloader/main.c
@@ -131,10 +131,10 @@ static void drivers_init(secbool *touch_initialized) {
 }
 
 static void drivers_deinit(void) {
-#ifdef FIXED_HW_DEINIT
 #ifdef USE_BACKUP_RAM
   backup_ram_deinit();
 #endif
+#ifdef FIXED_HW_DEINIT
 #ifdef USE_BUTTON
   button_deinit();
 #endif
diff --git a/core/embed/projects/kernel/main.c b/core/embed/projects/kernel/main.c
index e3ae28807f..a36a3005f7 100644
--- a/core/embed/projects/kernel/main.c
+++ b/core/embed/projects/kernel/main.c
@@ -99,7 +99,6 @@
 #endif
 
 void drivers_init() {
-
 #ifdef USE_BACKUP_RAM
   backup_ram_init();
 #endif
diff --git a/core/embed/projects/prodtest/cmd/prodtest_backup_ram.c b/core/embed/projects/prodtest/cmd/prodtest_backup_ram.c
index 4154221907..26d4d35433 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_backup_ram.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_backup_ram.c
@@ -17,25 +17,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifdef USE_BACKUP_RAM
+
 #include <rtl/cli.h>
 #include <sys/backup_ram.h>
 #include <sys/systick.h>
 #include <trezor_rtl.h>
 
 static void prodtest_backup_ram_write(cli_t* cli) {
+  uint32_t soc = 0;
 
-  if (cli_arg_count(cli) != 1) {
-    cli_error_arg_count(cli);
+  if (!cli_arg_uint32(cli, "soc_percent", &soc) || soc > 100) {
+    cli_error_arg(cli, "Expecting soc_percent argument in range 0-100");
     return;
   }
 
-  uint32_t soc = 0;
-
-  cli_arg_uint32(cli, "soc_percent", &soc);
-
-  if (!cli_arg_uint32(cli, "soc_percent", &soc) ||
-          soc > 100) {
-    cli_error_arg(cli, "Expecting soc_percent argument in range 0-100");
+  if (cli_arg_count(cli) > 1) {
+    cli_error_arg_count(cli);
     return;
   }
 
@@ -142,3 +140,5 @@ PRODTEST_CLI_CMD(
     .info = "Erase unused regions of backup RAM",
     .args = ""
 );
+
+#endif // #ifdef USE_BACKUP_RAM