diff --git a/netbox/ipam/forms/models.py b/netbox/ipam/forms/models.py
index c15a19fb0..356eb667d 100644
--- a/netbox/ipam/forms/models.py
+++ b/netbox/ipam/forms/models.py
@@ -7,6 +7,7 @@ from extras.models import Tag
 from ipam.constants import *
 from ipam.models import *
 from tenancy.forms import TenancyForm
+from tenancy.models import Tenant
 from utilities.forms import (
     BootstrapMixin, ContentTypeChoiceField, DatePicker, DynamicModelChoiceField, DynamicModelMultipleChoiceField,
     NumericArrayField, SlugField, StaticSelect, StaticSelectMultiple,
@@ -208,7 +209,12 @@ class PrefixAssignForm(BootstrapMixin, forms.Form):
     site_id = DynamicModelChoiceField(
         queryset=Site.objects.all(),
         required=False,
-        label='Site'
+        label='Site',
+    )
+    tenant_id = DynamicModelChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False,
+        label='Tenant',
     )
     vrf_id = DynamicModelChoiceField(
         queryset=VRF.objects.all(),
diff --git a/netbox/templates/ipam/prefix_assign.html b/netbox/templates/ipam/prefix_assign.html
index fafcfde10..e09b5db2d 100644
--- a/netbox/templates/ipam/prefix_assign.html
+++ b/netbox/templates/ipam/prefix_assign.html
@@ -20,6 +20,7 @@
                 <div class="field-group">
                     <h6>Select Prefix</h6>
                     {% render_field form.site_id %}
+                    {% render_field form.tenant_id %}
                     {% render_field form.vrf_id %}
                     {% render_field form.q %}
                 </div>