diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py
index 21bdb4782..b6e664c91 100644
--- a/netbox/dcim/tables/devices.py
+++ b/netbox/dcim/tables/devices.py
@@ -220,7 +220,9 @@ class DeviceAssignTable(BaseTable):
         verbose_name='Name'
     )
     status = ChoiceFieldColumn()
-    tenant = TenantColumn()
+    tenant = tables.TemplateColumn(
+        template_code=DEVICE_ASSIGN_TENANT
+    )
     site = tables.Column()
     location = tables.Column()
     rack = tables.Column()
diff --git a/netbox/dcim/tables/template_code.py b/netbox/dcim/tables/template_code.py
index 4fffc7082..12d2683b1 100644
--- a/netbox/dcim/tables/template_code.py
+++ b/netbox/dcim/tables/template_code.py
@@ -102,6 +102,16 @@ DEVICE_ASSIGN_LINK = """
 <a href="{% url 'dcim:device_edit' pk=record.pk %}?rack={{ request.GET.rack }}&position={{ request.GET.position }}&site={{ request.GET.site }}&location={{ object.GET.location }}&face={{ request.GET.face }}&return_url={{ request.GET.return_url }}">{{ record }}</a>
 """
 
+DEVICE_ASSIGN_TENANT = """
+{% if record.tenant %}
+    {{ record.tenant }}
+{% elif record.vrf.tenant %}
+    {{ record.vrf.tenant }}
+{% else %}
+    &mdash;
+{% endif %}
+"""
+
 #
 # Device component buttons
 #