diff --git a/templates/columns_definitions/column_attributes.twig b/templates/columns_definitions/column_attributes.twig
index dc4717503b..9a1393ea74 100644
--- a/templates/columns_definitions/column_attributes.twig
+++ b/templates/columns_definitions/column_attributes.twig
@@ -83,13 +83,8 @@
     {% set ci = ci + 1 %}
 </td>
 <td class="text-center">
-    {# column NULL #}
-    {% include 'columns_definitions/column_null.twig' with {
-        'column_number': column_number,
-        'ci': ci,
-        'ci_offset': ci_offset,
-        'column_meta': column_meta
-    } only %}
+    <input name="field_null[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" type="checkbox" value="YES" class="allow_null"
+      {{- column_meta['Null'] is not empty and column_meta['Null'] != 'NO' and column_meta['Null'] != 'NOT NULL' ? ' checked' }}>
     {% set ci = ci + 1 %}
 </td>
 {% if change_column is defined and change_column is not empty %}
diff --git a/templates/columns_definitions/column_null.twig b/templates/columns_definitions/column_null.twig
deleted file mode 100644
index 5afd6497ef..0000000000
--- a/templates/columns_definitions/column_null.twig
+++ /dev/null
@@ -1,8 +0,0 @@
-<input name="field_null[{{ column_number }}]"
-    id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    {% if column_meta['Null'] is not empty and column_meta['Null'] != 'NO' and column_meta['Null'] != 'NOT NULL' -%}
-        checked="checked"
-    {%- endif %}
-    type="checkbox"
-    value="YES"
-    class="allow_null">
diff --git a/templates/database/central_columns/edit_table_row.twig b/templates/database/central_columns/edit_table_row.twig
index f63ef575e6..9dc337f8cf 100644
--- a/templates/database/central_columns/edit_table_row.twig
+++ b/templates/database/central_columns/edit_table_row.twig
@@ -71,12 +71,8 @@
   </td>
 
   <td class="nowrap" name="col_isNull">
-    {% include 'columns_definitions/column_null.twig' with {
-      'column_number': row_num,
-      'ci': 6,
-      'ci_offset': 0,
-      'column_meta': {'Null': row['col_isNull']}
-    } only %}
+    <input name="field_null[{{ row_num }}]" id="field_{{ row_num }}_6" type="checkbox" value="YES" class="allow_null"
+      {{- row['col_isNull'] is not empty and row['col_isNull'] != 'NO' and row['col_isNull'] != 'NOT NULL' ? ' checked' }}>
   </td>
 
   <td class="nowrap" name="col_extra">
diff --git a/templates/database/central_columns/main.twig b/templates/database/central_columns/main.twig
index a832727399..e64fac8bc0 100644
--- a/templates/database/central_columns/main.twig
+++ b/templates/database/central_columns/main.twig
@@ -116,12 +116,7 @@
                             } only %}
                         </td>
                         <td class="nowrap" name="col_isNull">
-                            {% include 'columns_definitions/column_null.twig' with {
-                                'column_number': 0,
-                                'ci': 6,
-                                'ci_offset': 0,
-                                'column_meta': {}
-                            } only %}
+                          <input name="field_null[0]" id="field_0_6" type="checkbox" value="YES" class="allow_null">
                         </td>
                         <td class="nowrap" name="col_extra">
                             {% include 'columns_definitions/column_extra.twig' with {
@@ -368,14 +363,8 @@
                             </td>
                             <td class="nowrap" name="col_isNull">
                                 <span>{{ row['col_isNull'] ? 'Yes' | trans : 'No' | trans }}</span>
-                                {% include 'columns_definitions/column_null.twig' with {
-                                    'column_number': row_num,
-                                    'ci': 6,
-                                    'ci_offset': 0,
-                                    'column_meta': {
-                                        'Null': row['col_isNull']
-                                    }
-                                } only %}
+                                <input name="field_null[{{ row_num }}]" id="field_{{ row_num }}_6" type="checkbox" value="YES" class="allow_null"
+                                  {{- row['col_isNull'] is not empty and row['col_isNull'] != 'NO' and row['col_isNull'] != 'NOT NULL' ? ' checked' }}>
                             </td>
                             <td class="nowrap" name="col_extra">
                                 <span>{{ row['col_extra'] }}</span>