diff --git a/crispy_bootstrap4/templates/bootstrap4/field.html b/crispy_bootstrap4/templates/bootstrap4/field.html
index 76591bf..56fe326 100644
--- a/crispy_bootstrap4/templates/bootstrap4/field.html
+++ b/crispy_bootstrap4/templates/bootstrap4/field.html
@@ -11,7 +11,7 @@
     {% endif %}
     <{% if tag %}{{ tag }}{% else %}div{% endif %} id="div_{{ field.auto_id }}" class="{% if not field|is_checkbox %}form-group{% if 'form-horizontal' in form_class %} row{% endif %}{% else %}{%if use_custom_control%}{% if tag != 'td' %}custom-control {%endif%} custom-checkbox{% else %}form-check{% endif %}{% endif %}{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}">
         {% if field.label and not field|is_checkbox and form_show_labels %}
-        {# not field|is_radioselect in row below can be removed once Django 3.2 is no longer supported #}    
+        {# not field|is_radioselect in row below can be removed once Django 3.2 is no longer supported #}
         <label {% if field.id_for_label and not field|is_radioselect %}for="{{ field.id_for_label }}" {% endif %}class="{% if 'form-horizontal' in form_class %}col-form-label {% endif %}{{ label_class }}{% if field.field.required %} requiredField{% endif %}">
                 {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
             </label>
@@ -26,8 +26,12 @@
         {% endif %}
 
         {% if not field|is_checkboxselectmultiple and not field|is_radioselect %}
-            {% if field|is_checkbox and form_show_labels %}
-                {%if use_custom_control%}
+            {% if field|is_checkbox %}
+                {% if use_custom_control %}
+                    {% if tag == 'td' %}
+                        <div class="custom-control custom-checkbox">
+                    {% endif %}
+
                     {% if field.errors %}
                         {% crispy_field field 'class' 'custom-control-input is-invalid' %}
                     {% else %}
@@ -41,9 +45,16 @@
                     {% endif %}
                 {% endif %}
                 <label for="{{ field.id_for_label }}" class="{%if use_custom_control%}custom-control-label{% else %}form-check-label{% endif %}{% if field.field.required %} requiredField{% endif %}">
-                    {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
+                    {% if form_show_labels %}
+                        {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
+                    {% else %}
+                        &nbsp;
+                    {% endif %}
                 </label>
                 {% include 'bootstrap4/layout/help_text_and_errors.html' %}
+                {% if use_custom_control and tag == 'td' %}
+                    </div>
+                {% endif %}
             {% elif field|is_file and use_custom_control  %}
                 {% include 'bootstrap4/layout/field_file.html' %}
             {% else %}
@@ -55,13 +66,13 @@
                             {% crispy_field field 'class' 'custom-select' %}
                         {% endif %}
                     {% elif field|is_file %}
-                        {% if field.errors %}                 
+                        {% if field.errors %}
                             {% crispy_field field 'class' 'form-control-file is-invalid' %}
                         {% else %}
                             {% crispy_field field 'class' 'form-control-file' %}
                         {% endif %}
                     {% else %}
-                        {% if field.errors %}                      
+                        {% if field.errors %}
                             {% crispy_field field 'class' 'form-control is-invalid' %}
                         {% else %}
                             {% crispy_field field 'class' 'form-control' %}
diff --git a/tests/results/bootstrap4/test_layout/test_inline_formset_checkbox.html b/tests/results/bootstrap4/test_layout/test_inline_formset_checkbox.html
index 0c851d2..4df52f7 100644
--- a/tests/results/bootstrap4/test_layout/test_inline_formset_checkbox.html
+++ b/tests/results/bootstrap4/test_layout/test_inline_formset_checkbox.html
@@ -21,17 +21,19 @@
         <tr class="d-none empty-form">
             <div class="form-group">
                 <td id="div_id_form-__prefix__-box_one" class="custom-checkbox">
-                    <div>
-                        <input type="checkbox" name="form-__prefix__-box_one" class="checkboxinput form-control"
-                               id="id_form-__prefix__-box_one">
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" name="form-__prefix__-box_one" class="checkboxinput custom-control-input"
+                                id="id_form-__prefix__-box_one">
+                        <label for="id_form-__prefix__-box_one" class="custom-control-label requiredField">&nbsp;</label>
                     </div>
                 </td>
             </div>
             <div class="form-group">
                 <td id="div_id_form-__prefix__-box_two" class="custom-checkbox">
-                    <div>
-                        <input type="checkbox" name="form-__prefix__-box_two" class="checkboxinput form-control"
-                               id="id_form-__prefix__-box_two">
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" name="form-__prefix__-box_two" class="checkboxinput custom-control-input"
+                                id="id_form-__prefix__-box_two">
+                        <label for="id_form-__prefix__-box_two" class="custom-control-label requiredField">&nbsp;</label>
                     </div>
                 </td>
             </div>
@@ -39,17 +41,19 @@
         <tr>
             <div class="form-group">
                 <td id="div_id_form-0-box_one" class="custom-checkbox">
-                    <div>
-                        <input type="checkbox" name="form-0-box_one" class="checkboxinput form-control"
-                               id="id_form-0-box_one">
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" name="form-0-box_one" class="checkboxinput custom-control-input"
+                                id="id_form-0-box_one">
+                        <label for="id_form-0-box_one" class="custom-control-label requiredField">&nbsp;</label>
                     </div>
                 </td>
             </div>
             <div class="form-group">
                 <td id="div_id_form-0-box_two" class="custom-checkbox">
-                    <div>
-                        <input type="checkbox" name="form-0-box_two" class="checkboxinput form-control"
-                               id="id_form-0-box_two">
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" name="form-0-box_two" class="checkboxinput custom-control-input"
+                                id="id_form-0-box_two">
+                        <label for="id_form-0-box_two" class="custom-control-label requiredField">&nbsp;</label>
                     </div>
                 </td>
             </div>