diff --git a/node-gui/Cargo.toml b/node-gui/Cargo.toml
index cb62a562b..3036e6d20 100644
--- a/node-gui/Cargo.toml
+++ b/node-gui/Cargo.toml
@@ -40,4 +40,4 @@ tokio.workspace = true
 winres = "0.1"
 
 [features]
-trezor = ["wallet-controller/trezor", "wallet-types/trezor"]
+trezor = ["wallet-controller/trezor", "wallet-types/trezor", "wallet-cli-commands/trezor", "node-gui-backend/trezor"]
diff --git a/node-gui/backend/Cargo.toml b/node-gui/backend/Cargo.toml
index f82e15fff..424ce99f0 100644
--- a/node-gui/backend/Cargo.toml
+++ b/node-gui/backend/Cargo.toml
@@ -43,4 +43,4 @@ rstest.workspace = true
 serde_json.workspace = true
 
 [features]
-trezor = ["wallet/trezor", "wallet-controller/trezor", "wallet-types/trezor", "wallet-rpc-lib/trezor", "wallet-rpc-client/trezor"]
+trezor = ["wallet/trezor", "wallet-controller/trezor", "wallet-types/trezor", "wallet-rpc-lib/trezor", "wallet-rpc-client/trezor", "wallet-cli-commands/trezor"]
diff --git a/wallet/Cargo.toml b/wallet/Cargo.toml
index 35b342c30..082851319 100644
--- a/wallet/Cargo.toml
+++ b/wallet/Cargo.toml
@@ -45,5 +45,3 @@ tempfile.workspace = true
 [features]
 trezor = ["dep:trezor-client", "wallet-types/trezor"]
 trezor-emulator = []
-
-default = ["trezor"]
diff --git a/wallet/wallet-rpc-lib/src/lib.rs b/wallet/wallet-rpc-lib/src/lib.rs
index 1b0e8f49d..98affde07 100644
--- a/wallet/wallet-rpc-lib/src/lib.rs
+++ b/wallet/wallet-rpc-lib/src/lib.rs
@@ -18,6 +18,7 @@ pub mod config;
 mod rpc;
 mod service;
 
+#[cfg(feature = "trezor")]
 use rpc::types::HardwareWalletType;
 pub use rpc::{
     types, ColdWalletRpcClient, ColdWalletRpcDescription, ColdWalletRpcServer, RpcCreds, RpcError,
@@ -25,6 +26,7 @@ pub use rpc::{
 };
 pub use service::{Event, EventStream, TxState, WalletHandle, /* WalletResult, */ WalletService,};
 use wallet_controller::{NodeInterface, NodeRpcClient};
+#[cfg(feature = "trezor")]
 use wallet_types::wallet_type::WalletType;
 
 use std::{fmt::Debug, time::Duration};