diff --git a/Makefile b/Makefile
index 04e91b9a..5caee634 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ XDRGEN_VERSION=ac1653599b97b298e72c0186b5685bffa120b6aa
 # XDRGEN_LOCAL=1
 XDRGEN_TYPES_CUSTOM_STR_IMPL_CURR=PublicKey,AccountId,MuxedAccount,MuxedAccountMed25519,SignerKey,SignerKeyEd25519SignedPayload,NodeId,ScAddress,AssetCode,AssetCode4,AssetCode12,ClaimableBalanceId
 XDRGEN_TYPES_CUSTOM_STR_IMPL_NEXT=PublicKey,AccountId,MuxedAccount,MuxedAccountMed25519,SignerKey,SignerKeyEd25519SignedPayload,NodeId,ScAddress,AssetCode,AssetCode4,AssetCode12,ClaimableBalanceId
-XDRGEN_TYPES_CUSTOM_JSONSCHEMA_IMPL_CURR=PublicKey,AccountId,MuxedAccount,MuxedAccountMed25519,SignerKey,SignerKeyEd25519SignedPayload,NodeId,ScAddress,AssetCode,AssetCode4,AssetCode12
-XDRGEN_TYPES_CUSTOM_JSONSCHEMA_IMPL_NEXT=PublicKey,AccountId,MuxedAccount,MuxedAccountMed25519,SignerKey,SignerKeyEd25519SignedPayload,NodeId,ScAddress,AssetCode,AssetCode4,AssetCode12
+XDRGEN_TYPES_CUSTOM_JSONSCHEMA_IMPL_CURR=PublicKey,AccountId,MuxedAccount,MuxedAccountMed25519,SignerKey,SignerKeyEd25519SignedPayload,NodeId,ScAddress,AssetCode,AssetCode4,AssetCode12,ClaimableBalanceId
+XDRGEN_TYPES_CUSTOM_JSONSCHEMA_IMPL_NEXT=PublicKey,AccountId,MuxedAccount,MuxedAccountMed25519,SignerKey,SignerKeyEd25519SignedPayload,NodeId,ScAddress,AssetCode,AssetCode4,AssetCode12,ClaimableBalanceId
 
 all: build test
 
diff --git a/src/curr/generated.rs b/src/curr/generated.rs
index 05673cb1..c4356f9f 100644
--- a/src/curr/generated.rs
+++ b/src/curr/generated.rs
@@ -14752,7 +14752,6 @@ impl WriteXdr for ClaimableBalanceIdType {
     all(feature = "serde", feature = "alloc"),
     derive(serde_with::SerializeDisplay, serde_with::DeserializeFromStr)
 )]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[allow(clippy::large_enum_variant)]
 pub enum ClaimableBalanceId {
     ClaimableBalanceIdTypeV0(Hash),
diff --git a/src/curr/jsonschema.rs b/src/curr/jsonschema.rs
index ce23b940..b70c3035 100644
--- a/src/curr/jsonschema.rs
+++ b/src/curr/jsonschema.rs
@@ -26,3 +26,4 @@ impl_json_schema_string!(ScAddress);
 impl_json_schema_string!(AssetCode);
 impl_json_schema_string!(AssetCode4);
 impl_json_schema_string!(AssetCode12);
+impl_json_schema_string!(ClaimableBalanceId);
diff --git a/src/next/generated.rs b/src/next/generated.rs
index 35e6129a..2a6cdd3b 100644
--- a/src/next/generated.rs
+++ b/src/next/generated.rs
@@ -14752,7 +14752,6 @@ impl WriteXdr for ClaimableBalanceIdType {
     all(feature = "serde", feature = "alloc"),
     derive(serde_with::SerializeDisplay, serde_with::DeserializeFromStr)
 )]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[allow(clippy::large_enum_variant)]
 pub enum ClaimableBalanceId {
     ClaimableBalanceIdTypeV0(Hash),
diff --git a/src/next/jsonschema.rs b/src/next/jsonschema.rs
index ce23b940..b70c3035 100644
--- a/src/next/jsonschema.rs
+++ b/src/next/jsonschema.rs
@@ -26,3 +26,4 @@ impl_json_schema_string!(ScAddress);
 impl_json_schema_string!(AssetCode);
 impl_json_schema_string!(AssetCode4);
 impl_json_schema_string!(AssetCode12);
+impl_json_schema_string!(ClaimableBalanceId);