diff --git a/substrate/bin/node/cli/src/service.rs b/substrate/bin/node/cli/src/service.rs
index 7b1ab2c1eb..268a170a82 100644
--- a/substrate/bin/node/cli/src/service.rs
+++ b/substrate/bin/node/cli/src/service.rs
@@ -560,7 +560,8 @@ pub fn new_full(config: Configuration, cli: Cli) -> Result<TaskManager, ServiceE
 		cli.storage_monitor,
 		database_source,
 		&task_manager.spawn_essential_handle(),
-	)?;
+	)
+	.map_err(|e| ServiceError::Application(e.into()))?;
 
 	Ok(task_manager)
 }
diff --git a/substrate/client/service/src/error.rs b/substrate/client/service/src/error.rs
index c61c516404..6b71e46b4e 100644
--- a/substrate/client/service/src/error.rs
+++ b/substrate/client/service/src/error.rs
@@ -48,9 +48,6 @@ pub enum Error {
 	#[error(transparent)]
 	Telemetry(#[from] sc_telemetry::Error),
 
-	#[error(transparent)]
-	Storage(#[from] sc_storage_monitor::Error),
-
 	#[error("Best chain selection strategy (SelectChain) is not provided.")]
 	SelectChainRequired,