diff --git a/boards/hal/src/rpi/rpi4/panic_wait.rs b/boards/hal/src/rpi/rpi4/panic_wait.rs
index c352cb92..8546a1a4 100644
--- a/boards/hal/src/rpi/rpi4/panic_wait.rs
+++ b/boards/hal/src/rpi/rpi4/panic_wait.rs
@@ -75,7 +75,7 @@ fn panic(info: &PanicInfo) -> ! {
         location,
         line,
         column,
-        info.message().unwrap_or(&format_args!("")),
+        info.message(),
     );
 
     cpu_core::wait_forever()
diff --git a/boards/update/src/update/update_flash.rs b/boards/update/src/update/update_flash.rs
index 81732e8e..045cc3da 100644
--- a/boards/update/src/update/update_flash.rs
+++ b/boards/update/src/update/update_flash.rs
@@ -300,7 +300,7 @@ where
                     {
                         match self.rustboot_update(true) {
                             Err(_v) => {
-                                #[cfg(feature = "defmt")]
+                                // #[cfg(feature = "defmt")]
                                 panic!("all boot options exhausted")
                             } // all boot options exhausted
                             Ok(ref mut img) => {
@@ -321,7 +321,7 @@ where
                     {
                         match self.rustboot_update(true) {
                             Err(_v) => {
-                                #[cfg(feature = "defmt")]
+                                // #[cfg(feature = "defmt")]
                                 panic!("all boot options exhausted")
                             } // all boot options exhausted
                             Ok(ref mut img) => {