diff --git a/InvenTree/part/forms.py b/InvenTree/part/forms.py
index 38280bbc1c..286f8ac451 100644
--- a/InvenTree/part/forms.py
+++ b/InvenTree/part/forms.py
@@ -51,18 +51,6 @@ class BomUploadSelectFile(HelperForm):
         ]
 
 
-class BomUploadSelectFields(HelperForm):
-    """ Form for selecting BOM fields """
-
-    starting_row = forms.IntegerField(required=True, initial=2, help_text='Index of starting row', validators=[MinValueValidator(1)])
-
-    class Meta:
-        model = Part
-        fields = [
-            'starting_row',
-        ]
-
-
 class EditPartAttachmentForm(HelperForm):
     """ Form for editing a PartAttachment object """
 
diff --git a/InvenTree/part/templates/part/bom_upload/select_fields.html b/InvenTree/part/templates/part/bom_upload/select_fields.html
index 026ffb1a40..21849f31f8 100644
--- a/InvenTree/part/templates/part/bom_upload/select_fields.html
+++ b/InvenTree/part/templates/part/bom_upload/select_fields.html
@@ -24,9 +24,6 @@
 <form method="post" action='' class='js-modal-form' enctype="multipart/form-data">
     <button type="submit" class="save btn btn-default">Submit Selections</button>
     {% csrf_token %}
-    {% load crispy_forms_tags %}
-
-    {% crispy form %}
 
     <input type='hidden' name='form_step' value='select_fields'/>
 
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index b7bed73003..b3e9807404 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -671,13 +671,8 @@ class BomUpload(FormView):
 
     def get_form_class(self):
 
-        form_step = self.request.POST.get('form_step', None)
-
-        if form_step == 'select_fields':
-            return part_forms.BomUploadSelectFields
-        else:
-            # Default form is the starting point
-            return part_forms.BomUploadSelectFile
+        # Default form is the starting point
+        return part_forms.BomUploadSelectFile
 
     def get_context_data(self, *args, **kwargs):
 
@@ -776,7 +771,7 @@ class BomUpload(FormView):
 
         if bom_file_valid:
             # BOM file is valid? Proceed to the next step!
-            form = part_forms.BomUploadSelectFields
+            form = None
             self.template_name = 'part/bom_upload/select_fields.html'
 
             self.extractDataFromFile(manager)
@@ -983,8 +978,6 @@ class BomUpload(FormView):
         self.getTableDataFromPost()
 
         valid = len(self.missing_columns) == 0 and not self.duplicates
-
-        form = part_forms.BomUploadSelectFields
         
         if valid:
             # Try to extract meaningful data
@@ -994,7 +987,7 @@ class BomUpload(FormView):
         else:
             self.template_name = 'part/bom_upload/select_fields.html'
 
-        return self.render_to_response(self.get_context_data(form=form))
+        return self.render_to_response(self.get_context_data(form=None))
 
     def handlePartSelection(self):