diff --git a/substrate/client/cli/src/commands/export_blocks_cmd.rs b/substrate/client/cli/src/commands/export_blocks_cmd.rs
index 4e0e155dd5..ff35b5a51f 100644
--- a/substrate/client/cli/src/commands/export_blocks_cmd.rs
+++ b/substrate/client/cli/src/commands/export_blocks_cmd.rs
@@ -76,7 +76,7 @@ impl ExportBlocksCmd {
 		C: BlockBackend<B> + UsageProvider<B> + 'static,
 		<<B::Header as HeaderT>::Number as FromStr>::Err: Debug,
 	{
-		if let DatabaseSource::RocksDb { ref path, .. } = database_config {
+		if let Some(path) = database_config.path() {
 			info!("DB path: {}", path.display());
 		}
 
diff --git a/substrate/client/cli/src/commands/export_state_cmd.rs b/substrate/client/cli/src/commands/export_state_cmd.rs
index 4d67ab5d13..b76724caf0 100644
--- a/substrate/client/cli/src/commands/export_state_cmd.rs
+++ b/substrate/client/cli/src/commands/export_state_cmd.rs
@@ -18,7 +18,7 @@
 
 use crate::{
 	error,
-	params::{BlockNumberOrHash, PruningParams, SharedParams},
+	params::{BlockNumberOrHash, DatabaseParams, PruningParams, SharedParams},
 	CliConfiguration,
 };
 use clap::Parser;
@@ -42,6 +42,10 @@ pub struct ExportStateCmd {
 	#[allow(missing_docs)]
 	#[clap(flatten)]
 	pub pruning_params: PruningParams,
+
+	#[allow(missing_docs)]
+	#[clap(flatten)]
+	pub database_params: DatabaseParams,
 }
 
 impl ExportStateCmd {
@@ -81,4 +85,8 @@ impl CliConfiguration for ExportStateCmd {
 	fn pruning_params(&self) -> Option<&PruningParams> {
 		Some(&self.pruning_params)
 	}
+
+	fn database_params(&self) -> Option<&DatabaseParams> {
+		Some(&self.database_params)
+	}
 }