diff --git a/CHANGELOG.md b/CHANGELOG.md
index 137ceb798..e78fc5a16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,11 @@
 
 ## uefi-services - [Unreleased]
 
+### Changed
+
+- The `no_panic_handler` feature has been replaced with an additive
+  `panic_handler` feature. The new feature is enabled by default.
+
 ## uefi - 0.16
 
 ### Added
diff --git a/uefi-services/Cargo.toml b/uefi-services/Cargo.toml
index f32a06660..e4d40fea1 100644
--- a/uefi-services/Cargo.toml
+++ b/uefi-services/Cargo.toml
@@ -21,6 +21,7 @@ cfg-if = "1.0.0"
 qemu-exit = { version = "3.0.1", optional = true }
 
 [features]
+default = ["panic_handler"]
 # Enable QEMU-specific functionality
 qemu = ["qemu-exit"]
-no_panic_handler = []
+panic_handler = []
diff --git a/uefi-services/src/lib.rs b/uefi-services/src/lib.rs
index 1990752c1..dcc01fa8d 100644
--- a/uefi-services/src/lib.rs
+++ b/uefi-services/src/lib.rs
@@ -130,7 +130,7 @@ unsafe extern "efiapi" fn exit_boot_services(_e: Event, _ctx: Option<NonNull<c_v
     uefi::alloc::exit_boot_services();
 }
 
-#[cfg(not(feature = "no_panic_handler"))]
+#[cfg(feature = "panic_handler")]
 #[panic_handler]
 fn panic_handler(info: &core::panic::PanicInfo) -> ! {
     error!("{}", info);