diff --git a/rust/trezor-client/scripts/build_messages b/rust/trezor-client/scripts/build_messages
index 4a434f8c7c..33d736fe3a 100755
--- a/rust/trezor-client/scripts/build_messages
+++ b/rust/trezor-client/scripts/build_messages
@@ -25,6 +25,7 @@ FEATURES = {
     "Monero": "monero",
     "NEM": "nem",
     "Ripple": "ripple",
+    "Solana": "solana",
     "Stellar": "stellar",
     "Tezos": "tezos",
     "WebAuthn": "webauthn",
diff --git a/rust/trezor-client/src/messages/generated.rs b/rust/trezor-client/src/messages/generated.rs
index e23118719a..5e7608bf77 100644
--- a/rust/trezor-client/src/messages/generated.rs
+++ b/rust/trezor-client/src/messages/generated.rs
@@ -79,12 +79,6 @@ trezor_message_impl! {
     DebugLinkEraseSdCard => MessageType_DebugLinkEraseSdCard,
     DebugLinkWatchLayout => MessageType_DebugLinkWatchLayout,
     DebugLinkResetDebugEvents => MessageType_DebugLinkResetDebugEvents,
-    SolanaGetPublicKey => MessageType_SolanaGetPublicKey,
-    SolanaPublicKey => MessageType_SolanaPublicKey,
-    SolanaGetAddress => MessageType_SolanaGetAddress,
-    SolanaAddress => MessageType_SolanaAddress,
-    SolanaSignTx => MessageType_SolanaSignTx,
-    SolanaTxSignature => MessageType_SolanaTxSignature,
 }
 
 #[cfg(feature = "binance")]
@@ -244,6 +238,16 @@ trezor_message_impl! {
     RippleSignedTx => MessageType_RippleSignedTx,
 }
 
+#[cfg(feature = "solana")]
+trezor_message_impl! {
+    SolanaGetPublicKey => MessageType_SolanaGetPublicKey,
+    SolanaPublicKey => MessageType_SolanaPublicKey,
+    SolanaGetAddress => MessageType_SolanaGetAddress,
+    SolanaAddress => MessageType_SolanaAddress,
+    SolanaSignTx => MessageType_SolanaSignTx,
+    SolanaTxSignature => MessageType_SolanaTxSignature,
+}
+
 #[cfg(feature = "stellar")]
 trezor_message_impl! {
     StellarSignTx => MessageType_StellarSignTx,
diff --git a/rust/trezor-client/src/protos/mod.rs b/rust/trezor-client/src/protos/mod.rs
index 423abfb2ac..20bcebe924 100644
--- a/rust/trezor-client/src/protos/mod.rs
+++ b/rust/trezor-client/src/protos/mod.rs
@@ -32,6 +32,7 @@ mod generated {
         "monero" => messages_monero
         "nem" => messages_nem
         "ripple" => messages_ripple
+        "solana" => messages_solana
         "stellar" => messages_stellar
         "tezos" => messages_tezos
         "webauthn" => messages_webauthn