diff --git a/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py b/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py
index 4d76507..751afdb 100644
--- a/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py
+++ b/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py
@@ -955,6 +955,9 @@ def _modify(self, modify_childs=1, ignore_license=0):
 
 		ml = self.call_udm_property_hook('hook_ldap_modlist', self, ml)
 
+		if any(True for x, y, z in ml if x == 'objectClass' and set(y) == set(z)):
+			ml = [c for c in ml if c[0] != 'objectClass']
+
 		#FIXME: timeout without exception if objectClass of Object is not exsistant !!
 		self.lo.modify(self.dn, ml, ignore_license=ignore_license)