diff --git a/apps/src/lib/node/ledger/shell/finalize_block.rs b/apps/src/lib/node/ledger/shell/finalize_block.rs
index 2b2c7b4c0e..9531cfcc7c 100644
--- a/apps/src/lib/node/ledger/shell/finalize_block.rs
+++ b/apps/src/lib/node/ledger/shell/finalize_block.rs
@@ -440,14 +440,16 @@ where
                 }
                 #[cfg(not(feature = "abcipp"))]
                 {
-                    let proposer = self
-                        .storage
-                        .read_current_block_proposer_address()
-                        .expect(
-                            "Current block proposer should always be set in \
-                             ProcessProposal",
-                        );
-                    self.storage.write_last_block_proposer_address(&proposer);
+                    let proposer =
+                        self.storage.read_current_block_proposer_address();
+                    // .expect(
+                    //     "Current block proposer should always be set in \
+                    //      ProcessProposal",
+                    // );
+                    if let Some(proposer) = proposer {
+                        self.storage
+                            .write_last_block_proposer_address(&proposer);
+                    }
                 }
             }
         }