diff --git a/crates/ibc-types-lightclients-tendermint/src/client_state.rs b/crates/ibc-types-lightclients-tendermint/src/client_state.rs
index 93f116b..0b2003a 100644
--- a/crates/ibc-types-lightclients-tendermint/src/client_state.rs
+++ b/crates/ibc-types-lightclients-tendermint/src/client_state.rs
@@ -79,6 +79,10 @@ impl ClientState {
             });
         }
 
+        if chain_id.as_str() == "" {
+            return Err(Error::ChainIdEmpty);
+        }
+
         // `TrustThreshold` is guaranteed to be in the range `[0, 1)`, but a `TrustThreshold::ZERO`
         // value is invalid in this context
         if trust_level == TrustThreshold::ZERO {
diff --git a/crates/ibc-types-lightclients-tendermint/src/error.rs b/crates/ibc-types-lightclients-tendermint/src/error.rs
index 2fb2420..8e71652 100644
--- a/crates/ibc-types-lightclients-tendermint/src/error.rs
+++ b/crates/ibc-types-lightclients-tendermint/src/error.rs
@@ -22,6 +22,8 @@ pub enum Error {
         len: usize,
         max_len: usize,
     },
+    /// Chain ID cannot be empty
+    ChainIdEmpty,
     /// invalid header, failed basic validation: `{reason}`, error: `{error}`
     InvalidHeader {
         reason: String,