diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py
index 25ffa67c2..705eb559c 100644
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -207,12 +207,12 @@ class RackReservationFilter(django_filters.FilterSet):
         to_field_name='slug',
         label='Group',
     )
-    tenant_id = NullableModelMultipleChoiceFilter(
+    tenant_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Tenant.objects.all(),
         label='Tenant (ID)',
     )
-    tenant = NullableModelMultipleChoiceFilter(
-        name='tenant',
+    tenant = django_filters.ModelMultipleChoiceFilter(
+        name='tenant__slug',
         queryset=Tenant.objects.all(),
         to_field_name='slug',
         label='Tenant (slug)',
diff --git a/netbox/dcim/migrations/0051_merge_20171031_2024.py b/netbox/dcim/migrations/0051_merge_20171031_2024.py
new file mode 100644
index 000000000..699429cd0
--- /dev/null
+++ b/netbox/dcim/migrations/0051_merge_20171031_2024.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2017-10-31 20:24
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0049_rackreservation_change_user'),
+        ('dcim', '0050_rackreservation_tenant'),
+    ]
+
+    operations = [
+    ]