diff --git a/packages/cli/src/modules/data-table/data-store-rows.repository.ts b/packages/cli/src/modules/data-table/data-store-rows.repository.ts
index ab155374a5..933af9f932 100644
--- a/packages/cli/src/modules/data-table/data-store-rows.repository.ts
+++ b/packages/cli/src/modules/data-table/data-store-rows.repository.ts
@@ -268,7 +268,7 @@ export class DataStoreRowsRepository {
 		}
 
 		if (useReturning) {
-			return extractReturningData(result.raw);
+			return normalizeRows(extractReturningData(result.raw), columns);
 		}
 
 		const ids = affectedRows.map((row) => row.id);
diff --git a/packages/cli/src/modules/data-table/utils/sql-utils.ts b/packages/cli/src/modules/data-table/utils/sql-utils.ts
index 2ec5eb689b..91cce1ad93 100644
--- a/packages/cli/src/modules/data-table/utils/sql-utils.ts
+++ b/packages/cli/src/modules/data-table/utils/sql-utils.ts
@@ -163,9 +163,9 @@ function hasRowReturnData(data: unknown): data is DataStoreRowReturn {
 		'id' in data &&
 		isNumber(data.id) &&
 		'createdAt' in data &&
-		isDate(data.createdAt) &&
+		(isDate(data.createdAt) || typeof data.createdAt === 'string') &&
 		'updatedAt' in data &&
-		isDate(data.updatedAt)
+		(isDate(data.updatedAt) || typeof data.updatedAt === 'string')
 	);
 }