diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 508a3edcf3..df196cffcf 100644
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -92,6 +92,9 @@ int is_entry_objectclass(
 			e->e_dn == NULL ? "" : e->e_dn,
 			oc->soc_oclass.oc_oid, 0 );
 
+		/* mark flags as set */
+		e->e_ocflags |= SLAP_OC__END;
+
 		return 0;
 	}