diff --git a/src/components/datatable/DataTable.vue b/src/components/datatable/DataTable.vue
index 8e39733f6..34ab3c6ec 100644
--- a/src/components/datatable/DataTable.vue
+++ b/src/components/datatable/DataTable.vue
@@ -64,7 +64,7 @@
                                 @click="onRowClick($event, rowData, index)" @touchend="onRowTouchEnd($event)" @keydown="onRowKeyDown($event, rowData, index)" :tabindex="selectionMode ? '0' : null"
                                 @mousedown="onRowMouseDown($event)" @dragstart="onRowDragStart($event, index)" @dragover="onRowDragOver($event,index)" @dragleave="onRowDragLeave($event)" @dragend="onRowDragEnd($event)" @drop="onRowDrop($event)">
                                 <template v-for="(col,i) of columns">
-                                    <DTBodyCell v-if="rowGroupMode !== 'subheader' || (groupRowsBy !== col.field)" :key="col.columnKey||col.field||i" :rowData="rowData" :column="col" :selected="isSelected(rowData)"
+                                    <DTBodyCell v-if="rowGroupMode === 'subheader' ? (groupRowsBy !== col.field) : true" :key="col.columnKey||col.field||i" :rowData="rowData" :column="col" :selected="isSelected(rowData)"
                                         :rowTogglerIcon="col.expander ? rowTogglerIcon(rowData): null" @row-toggle="toggleRow" 
                                         @radio-change="toggleRowWithRadio" @checkbox-change="toggleRowWithCheckbox" />
                                 </template>
diff --git a/src/views/datatable/DataTableRowGroupDemo.vue b/src/views/datatable/DataTableRowGroupDemo.vue
index 1a79e7719..5a454c609 100644
--- a/src/views/datatable/DataTableRowGroupDemo.vue
+++ b/src/views/datatable/DataTableRowGroupDemo.vue
@@ -30,9 +30,9 @@
             <h3>RowSpan Grouping</h3>
 			<DataTable :value="cars" rowGroupMode="rowspan" :groupRowsBy="['brand', 'year']" 
                 sortMode="multiple" :multiSortMeta="multiSortMeta">
-                <Column field="brand" header="Brand"></Column>
-                <Column field="vin" header="Vin"></Column>
+                <Column field="brand" header="Brand"></Column>               
                 <Column field="year" header="Year"></Column>
+                <Column field="vin" header="Vin"></Column>
                 <Column field="color" header="Color"></Column>
                 <Column field="price" header="Price"></Column>
             </DataTable>