diff --git a/internal/customermanagedkeys/key_vault_or_managed_hsm_key.go b/internal/customermanagedkeys/key_vault_or_managed_hsm_key.go
index 03fc423da624..d5b9deb3585b 100644
--- a/internal/customermanagedkeys/key_vault_or_managed_hsm_key.go
+++ b/internal/customermanagedkeys/key_vault_or_managed_hsm_key.go
@@ -240,5 +240,6 @@ func FlattenKeyVaultOrManagedHSMID(id string, hsmEnv environments.Api) (*KeyVaul
 
 func FlattenKeyVaultOrManagedHSMIDByComponents(baseUri, name, version string, hsmEnv environments.Api) (*KeyVaultOrManagedHSMKey, error) {
 	id := fmt.Sprintf("%s/keys/%s/%s", strings.TrimRight(baseUri, "/"), name, version)
+	id = strings.TrimSuffix(id, "/")
 	return FlattenKeyVaultOrManagedHSMID(id, hsmEnv)
 }