diff --git a/src/service.rs b/src/service.rs
index 4e9ab97cb73..b2d87572316 100644
--- a/src/service.rs
+++ b/src/service.rs
@@ -307,11 +307,15 @@ impl<P: Platform> ServiceResources<P> {
 
             // This is now preferably done using littlefs-fuse (when device is not yet locked),
             // and should be removed from firmware completely
+            #[cfg(debug_dump_store)]
             Request::DebugDumpStore(_request) => {
 
                 info_now!(":: PERSISTENT");
                 recursively_list(self.platform.store().ifs(), path!("/"));
 
+                info_now!(":: EXTERNAL");
+                recursively_list(self.platform.store().efs(), PathBuf::from("/"));
+
                 info_now!(":: VOLATILE");
                 recursively_list(self.platform.store().vfs(), path!("/"));
 
@@ -342,6 +346,9 @@ impl<P: Platform> ServiceResources<P> {
 
             }
 
+            #[cfg(not(debug_dump_store))]
+            Request::DebugDumpStore(_request) => Err(Error::RequestNotAvailable),
+
             Request::ReadDirFirst(request) => {
                 let maybe_entry = match filestore.read_dir_first(&request.dir, request.location, request.not_before_filename.as_deref())? {
                     Some((entry, read_dir_state)) => {