diff --git a/doc/82-Changelog.md b/doc/82-Changelog.md
index f2713683..86968dfd 100644
--- a/doc/82-Changelog.md
+++ b/doc/82-Changelog.md
@@ -52,6 +52,7 @@ This version hasn't been released yet
 ### Permissions and Restrictions
 * FIX: monitoring-related permission checks have been refactored (#2712)
 * FIX: Hostgroup-Filters have not been applied to Overview tables (#2775)
+* FIX: error editing Hosts with hostgroup restriction in place (#2164, #2809)
 
 ### Configuration Branches
 * FEATURE: with this release, directorbranches v1.3 supports a "default branch" (#2688)
diff --git a/library/Director/Restriction/HostgroupRestriction.php b/library/Director/Restriction/HostgroupRestriction.php
index a0552ab0..f2face4d 100644
--- a/library/Director/Restriction/HostgroupRestriction.php
+++ b/library/Director/Restriction/HostgroupRestriction.php
@@ -93,7 +93,7 @@ class HostgroupRestriction extends ObjectRestriction
             ['id']
         )->where('id = ?', $hostgroup->id);
 
-        $this->filterHostGroupsQuery($query);
+        $this->filterHostGroupsQuery($query, 'h');
         return (int) $this->db->fetchOne($query) === (int) $hostgroup->get('id');
     }