diff --git a/compose/internal/repository/record_report_builder.go b/compose/internal/repository/record_report_builder.go
index e032b2cf5..635038702 100644
--- a/compose/internal/repository/record_report_builder.go
+++ b/compose/internal/repository/record_report_builder.go
@@ -53,8 +53,9 @@ func NewRecordReportBuilder(module *types.Module) *recordReportBuilder {
 	var report = squirrel.
 		Select().
 		Column(squirrel.Alias(squirrel.Expr("COUNT(*)"), "count")).
-		From("compose_record").
-		Where("module_id = ?", module.ID)
+		From("compose_record AS r").
+		Where("r.deleted_at IS NULL").
+		Where("r.module_id = ?", module.ID)
 
 	return &recordReportBuilder{
 		parser: ql.NewParser(),
@@ -88,7 +89,7 @@ func (b *recordReportBuilder) Build(metrics, dimensions, filters string) (sql st
 
 		if !alreadyJoined(i.Value) {
 			b.report = b.report.LeftJoin(fmt.Sprintf(
-				"compose_record_value AS rv_%s ON (rv_%s.record_id = compose_record.id AND rv_%s.name = ? AND rv_%s.deleted_at IS NULL)",
+				"compose_record_value AS rv_%s ON (rv_%s.record_id = r.id AND rv_%s.name = ? AND rv_%s.deleted_at IS NULL)",
 				i.Value, i.Value, i.Value, i.Value,
 			), i.Value)
 		}
diff --git a/compose/internal/repository/record_report_builder_test.go b/compose/internal/repository/record_report_builder_test.go
index 8b8fbc7a7..41bd2c5d5 100644
--- a/compose/internal/repository/record_report_builder_test.go
+++ b/compose/internal/repository/record_report_builder_test.go
@@ -20,10 +20,10 @@ func TestRecordReportBuilder2(t *testing.T) {
 
 	expected := "SELECT (COUNT(*)) AS count, (CAST(max(rv_single1.value) AS DECIMAL(14,2))) AS metric_0, " +
 		"(QUARTER(rv_ref1.value)) AS dimension_0 " +
-		"FROM compose_record " +
-		"LEFT JOIN compose_record_value AS rv_single1 ON (rv_single1.record_id = compose_record.id AND rv_single1.name = ? AND rv_single1.deleted_at IS NULL) " +
-		"LEFT JOIN compose_record_value AS rv_ref1 ON (rv_ref1.record_id = compose_record.id AND rv_ref1.name = ? AND rv_ref1.deleted_at IS NULL) " +
-		"WHERE module_id = ? AND rv_ref1.value = 2 " +
+		"FROM compose_record AS r " +
+		"LEFT JOIN compose_record_value AS rv_single1 ON (rv_single1.record_id = r.id AND rv_single1.name = ? AND rv_single1.deleted_at IS NULL) " +
+		"LEFT JOIN compose_record_value AS rv_ref1 ON (rv_ref1.record_id = r.id AND rv_ref1.name = ? AND rv_ref1.deleted_at IS NULL) " +
+		"WHERE r.deleted_at IS NULL AND r.module_id = ? AND rv_ref1.value = 2 " +
 		"GROUP BY dimension_0 " +
 		"ORDER BY dimension_0"
 
diff --git a/compose/internal/service/record.go b/compose/internal/service/record.go
index 6ecc42175..12776283d 100644
--- a/compose/internal/service/record.go
+++ b/compose/internal/service/record.go
@@ -127,7 +127,8 @@ func (svc record) Report(namespaceID, moduleID uint64, metrics, dimensions, filt
 		return
 	}
 
-	return svc.recordRepo.Report(m, metrics, dimensions, filter)
+	return svc.recordRepo.
+		Report(m, metrics, dimensions, filter)
 }
 
 func (svc record) Find(filter types.RecordFilter) (set types.RecordSet, f types.RecordFilter, err error) {