diff --git a/src/components/datatable/BodyCell.vue b/src/components/datatable/BodyCell.vue
index bc7de26ee..e87206ff4 100755
--- a/src/components/datatable/BodyCell.vue
+++ b/src/components/datatable/BodyCell.vue
@@ -3,6 +3,7 @@
         <span v-if="responsiveLayout === 'stack'" class="p-column-title">{{columnProp('header')}}</span>
         <component :is="column.children.body" :data="rowData" :column="column" :field="field" :index="rowIndex" :frozenRow="frozenRow" v-if="column.children && column.children.body && !d_editing" />
         <component :is="column.children.editor" :data="editingRowData" :column="column" :field="field" :index="rowIndex" :frozenRow="frozenRow" v-else-if="column.children && column.children.editor && d_editing" />
+        <component :is="column.children.body" :data="editingRowData" :column="column" :field="field" :index="rowIndex" :frozenRow="frozenRow" v-else-if="column.children && !column.children.editor && d_editing" />
         <template v-else-if="columnProp('selectionMode')">
             <DTRadioButton :value="rowData" :checked="selected" @change="toggleRowWithRadio" v-if="columnProp('selectionMode') === 'single'" />
             <DTCheckbox :value="rowData" :checked="selected" @change="toggleRowWithCheckbox" v-else-if="columnProp('selectionMode') ==='multiple'" />
@@ -130,6 +131,9 @@ export default {
             return ObjectUtils.getVNodeProp(this.column, prop);
         },
         resolveFieldData() {
+            if (!this.column.children.editor && this.editMode === 'row') {
+                return this.rowData;
+            }
             return ObjectUtils.resolveFieldData(this.rowData, this.field);
         },
         toggleRow(event) {