diff --git a/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/__base.py b/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/__base.py
index 2943f0a8f7..82e9078c92 100644
--- a/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/__base.py
+++ b/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/__base.py
@@ -314,7 +314,10 @@ def link(self):
 	@classmethod
 	def rewrite_filter(cls, filter, mapping, lo=None):
 		if filter.variable == 'ip':
-			filter.variable = 'aRecord'
+			filter.transform_to_conjunction(univention.admin.filter.conjunction('|', [
+				univention.admin.filter.expression('aRecord', filter.value, escape=False),
+				univention.admin.filter.expression('aAAARecord', filter.value, escape=False),
+			]))
 		elif filter.variable == 'dnsAlias':
 			found = univention.admin.filter.parse(univention.admin.handlers.dns.alias.lookup_alias_filter(lo, unicode(filter)))
 			if isinstance(found, univention.admin.filter.conjunction):