diff --git a/ipaserver/plugins/server.py b/ipaserver/plugins/server.py
index 7aea619b3..81abc66e7 100644
--- a/ipaserver/plugins/server.py
+++ b/ipaserver/plugins/server.py
@@ -692,6 +692,12 @@ class server_del(LDAPDelete):
                     message=_("You may need to manually remove them from the "
                               "tree")))
 
+    def _cleanup_server_dns_config(self, hostname):
+        try:
+            self.api.Command.dnsserver_del(hostname)
+        except errors.NotFound:
+            pass
+
     def pre_callback(self, ldap, dn, *keys, **options):
         pkey = self.obj.get_primary_key_from_dn(dn)
 
@@ -731,6 +737,9 @@ class server_del(LDAPDelete):
         # try to clean up the leftover DNS entries
         self._cleanup_server_dns_records(pkey)
 
+        # try to clean up the DNS config from ldap
+        self._cleanup_server_dns_config(pkey)
+
         return dn
 
     def exc_callback(self, keys, options, exc, call_func, *call_args,