diff --git a/docs/release-notes/version-2.7.md b/docs/release-notes/version-2.7.md
index f9557bf34..62b85bc83 100644
--- a/docs/release-notes/version-2.7.md
+++ b/docs/release-notes/version-2.7.md
@@ -1,3 +1,11 @@
+# v2.7.9 (FUTURE)
+
+## Bug Fixes
+
+* [#4277](https://github.com/netbox-community/netbox/issues/4277) - Fix filtering of clusters by tenant
+
+---
+
 # v2.7.8 (2020-02-25)
 
 ## Enhancements
diff --git a/netbox/virtualization/filters.py b/netbox/virtualization/filters.py
index 0d817ef47..79313f36e 100644
--- a/netbox/virtualization/filters.py
+++ b/netbox/virtualization/filters.py
@@ -34,7 +34,7 @@ class ClusterGroupFilterSet(NameSlugSearchFilterSet):
         fields = ['id', 'name', 'slug']
 
 
-class ClusterFilterSet(CustomFieldFilterSet, CreatedUpdatedFilterSet):
+class ClusterFilterSet(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet):
     id__in = NumericInFilter(
         field_name='id',
         lookup_expr='in'
@@ -84,10 +84,6 @@ class ClusterFilterSet(CustomFieldFilterSet, CreatedUpdatedFilterSet):
         to_field_name='slug',
         label='Cluster type (slug)',
     )
-    tenant = django_filters.ModelMultipleChoiceFilter(
-        queryset=Tenant.objects.all(),
-        label="Tenant (ID)"
-    )
     tag = TagFilter()
 
     class Meta: