diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock
index ef0584f4ce54012e4193c1288facba26cfc4c357..23229c365c38496909c5a069d4db160dadb3d52c 100644
--- a/substrate/Cargo.lock
+++ b/substrate/Cargo.lock
@@ -5954,7 +5954,6 @@ dependencies = [
  "app_dirs",
  "atty",
  "chrono",
- "clap",
  "derive_more",
  "env_logger 0.7.1",
  "fdlimit",
diff --git a/substrate/client/cli/Cargo.toml b/substrate/client/cli/Cargo.toml
index 1dc5f1a39fe3af615d59511f8d534e22f9fac21f..406bb1becc5fe1d46b75d9411832fb86e7779fd3 100644
--- a/substrate/client/cli/Cargo.toml
+++ b/substrate/client/cli/Cargo.toml
@@ -12,7 +12,6 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-clap = "2.33.0"
 derive_more = "0.99.2"
 env_logger = "0.7.0"
 log = "0.4.8"
diff --git a/substrate/client/cli/src/error.rs b/substrate/client/cli/src/error.rs
index 23c2bf05f0a145f50c4f2761da6108f6279438c0..31f6e1c1ff47fa3c33684cb5b1edccefcd437305 100644
--- a/substrate/client/cli/src/error.rs
+++ b/substrate/client/cli/src/error.rs
@@ -27,7 +27,7 @@ pub enum Error {
 	/// Io error
 	Io(std::io::Error),
 	/// Cli error
-	Cli(clap::Error),
+	Cli(structopt::clap::Error),
 	/// Service error
 	Service(sc_service::Error),
 	/// Client error