diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index 52ad8c26f..6e5489084 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -475,11 +475,11 @@ class IPAddressPatternForm(BootstrapMixin, forms.Form):
     pattern = ExpandableIPAddressField(label='Address pattern')
 
 
-class IPAddressBulkAddForm(BootstrapMixin, CustomFieldForm):
+class IPAddressBulkAddForm(BootstrapMixin, TenancyForm, CustomFieldForm):
 
     class Meta:
         model = IPAddress
-        fields = ['address', 'status', 'vrf', 'tenant', 'description']
+        fields = ['address', 'status', 'vrf', 'description', 'tenant_group', 'tenant']
 
     def __init__(self, *args, **kwargs):
         super(IPAddressBulkAddForm, self).__init__(*args, **kwargs)
diff --git a/netbox/templates/ipam/ipaddress_bulk_add.html b/netbox/templates/ipam/ipaddress_bulk_add.html
index 6dcfaf24e..668f495eb 100644
--- a/netbox/templates/ipam/ipaddress_bulk_add.html
+++ b/netbox/templates/ipam/ipaddress_bulk_add.html
@@ -15,10 +15,16 @@
             {% render_field pattern_form.pattern %}
             {% render_field model_form.status %}
             {% render_field model_form.vrf %}
-            {% render_field model_form.tenant %}
             {% render_field model_form.description %}
         </div>
     </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Tenancy</strong></div>
+        <div class="panel-body">
+            {% render_field model_form.tenant_group %}
+            {% render_field model_form.tenant %}
+        </div>
+    </div>
     {% if model_form.custom_fields %}
         <div class="panel panel-default">
             <div class="panel-heading"><strong>Custom Fields</strong></div>