diff --git a/pkg/repository/v1/sqlcv1/olap-overwrite.sql.go b/pkg/repository/v1/sqlcv1/olap-overwrite.sql.go
index caf9ad0ad..52df6875a 100644
--- a/pkg/repository/v1/sqlcv1/olap-overwrite.sql.go
+++ b/pkg/repository/v1/sqlcv1/olap-overwrite.sql.go
@@ -501,11 +501,10 @@ func InsertCutOverOLAPPayloadsIntoTempTable(ctx context.Context, tx DBTX, tableN
 					FROM inputs
 					ORDER BY tenant_id, external_id, inserted_at
 					ON CONFLICT(tenant_id, external_id, inserted_at) DO NOTHING
-					RETURNING *
 				)
 
 				SELECT tenant_id, external_id, inserted_at
-				FROM inserts
+				FROM inputs
 				ORDER BY tenant_id DESC, external_id DESC, inserted_at DESC
 				LIMIT 1
 				`,
diff --git a/pkg/repository/v1/sqlcv1/payload-store-overwrite.sql.go b/pkg/repository/v1/sqlcv1/payload-store-overwrite.sql.go
index 24d5e59d9..744681eda 100644
--- a/pkg/repository/v1/sqlcv1/payload-store-overwrite.sql.go
+++ b/pkg/repository/v1/sqlcv1/payload-store-overwrite.sql.go
@@ -72,11 +72,10 @@ func InsertCutOverPayloadsIntoTempTable(ctx context.Context, tx DBTX, tableName
 					FROM inputs
 					ORDER BY tenant_id, inserted_at, id, type
 					ON CONFLICT(tenant_id, id, inserted_at, type) DO NOTHING
-					RETURNING *
 				)
 
 				SELECT tenant_id, inserted_at, id, type
-				FROM inserts
+				FROM inputs
 				ORDER BY tenant_id DESC, inserted_at DESC, id DESC, type DESC
 				LIMIT 1
 				`,