diff --git a/CHANGES b/CHANGES
index 08023395e93fe6b3ad90d6597336a6f8d9a3cd75..971b8950e7d1f1f94b9aa2b2d3f1bfd10359a814 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ OpenLDAP 2.4.12 Engineering
 	Fixed liblutil executables on Windows (ITS#5604)
 	Fixed slapd aci performance (ITS#5636)
 	Fixed slapd aci's with sets (ITS#5627)
+	Fixed slapd attribute leak (ITS#5683)
 	Fixed slapd custom attribute inheritance (ITS#5642)
 	Fixed slapd dynacl mask handling (ITS#5637)
 	Fixed slapd firstComponentMatch normalization (ITS#5634)
diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index 54d197c495de09ecf28d556adf0b6aa446d10b01..9339c51e6e7f80ff4c7bc521ef2d4aef135d4c11 100644
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -939,6 +939,11 @@ error_return:;
 			at->at_oid = oidm;
 		}
 
+		if ( soidm ) {
+			SLAP_FREE( at->at_syntax_oid );
+			at->at_syntax_oid = soidm;
+		}
+
 	} else if ( rsat ) {
 		*rsat = sat;
 	}