diff --git a/common/client-core/src/client/key_manager/mod.rs b/common/client-core/src/client/key_manager/mod.rs
index 01eaa88fc3..6054f571f7 100644
--- a/common/client-core/src/client/key_manager/mod.rs
+++ b/common/client-core/src/client/key_manager/mod.rs
@@ -3,7 +3,9 @@
 
 use crate::client::key_manager::persistence::KeyStore;
 use nym_crypto::asymmetric::{encryption, identity};
-use nym_gateway_requests::registration::handshake::LegacySharedKeys;
+use nym_gateway_requests::registration::handshake::{
+    LegacySharedKeys, SharedGatewayKey, SharedSymmetricKey,
+};
 use nym_sphinx::acknowledgements::AckKey;
 use rand::{CryptoRng, RngCore};
 use std::sync::Arc;
@@ -85,4 +87,6 @@ fn _assert_keys_zeroize_on_drop() {
     _assert_zeroize_on_drop::<encryption::KeyPair>();
     _assert_zeroize_on_drop::<AckKey>();
     _assert_zeroize_on_drop::<LegacySharedKeys>();
+    _assert_zeroize_on_drop::<SharedSymmetricKey>();
+    _assert_zeroize_on_drop::<SharedGatewayKey>();
 }
diff --git a/common/gateway-requests/src/registration/handshake/shared_key/mod.rs b/common/gateway-requests/src/registration/handshake/shared_key/mod.rs
index 4fee47b6cc..7049abe095 100644
--- a/common/gateway-requests/src/registration/handshake/shared_key/mod.rs
+++ b/common/gateway-requests/src/registration/handshake/shared_key/mod.rs
@@ -18,7 +18,7 @@ pub mod legacy;
 
 pub type SharedKeySize = <GatewayEncryptionAlgorithm as KeySizeUser>::KeySize;
 
-#[derive(Debug, PartialEq, Zeroize)]
+#[derive(Debug, PartialEq, Zeroize, ZeroizeOnDrop)]
 pub enum SharedGatewayKey {
     Current(SharedSymmetricKey),
     Legacy(LegacySharedKeys),