diff --git a/compose/service/record.go b/compose/service/record.go
index 47c83339c..1c2d1b6c5 100644
--- a/compose/service/record.go
+++ b/compose/service/record.go
@@ -1042,7 +1042,7 @@ func (svc record) procUpdate(ctx context.Context, invokerID uint64, m *types.Mod
 	upd.DeletedAt = old.DeletedAt
 	upd.DeletedBy = old.DeletedBy
 
-	if err := SetRecordOwner(ctx, svc.ac, svc.store, old, upd, invokerID); err != nil {
+	if rve = SetRecordOwner(ctx, svc.ac, svc.store, old, upd, invokerID); !rve.IsValid() {
 		return
 	}
 
diff --git a/compose/service/record_test.go b/compose/service/record_test.go
index 568290108..ca8517b75 100644
--- a/compose/service/record_test.go
+++ b/compose/service/record_test.go
@@ -914,7 +914,7 @@ func TestSetRecordOwner(t *testing.T) {
 
 		role = &sysTypes.Role{Name: "role-with-ownership-change-permission", ID: 3000}
 
-		mod      = &types.Module{ID: 3}
+		mod      = &types.Module{ID: 3, NamespaceID: 71624}
 		old, upd *types.Record
 	)
 
diff --git a/tests/compose/record_test.go b/tests/compose/record_test.go
index 91436ee15..8d3697b33 100644
--- a/tests/compose/record_test.go
+++ b/tests/compose/record_test.go
@@ -151,6 +151,9 @@ func (h helper) makeRecord(module *types.Module, rvs ...*types.RecordValue) *typ
 		CreatedAt:   time.Now(),
 		ModuleID:    module.ID,
 		NamespaceID: module.NamespaceID,
+		// Passing the current owner in here since the tests (who care about this)
+		// rely on it being set to something valid.
+		OwnedBy: h.cUser.ID,
 
 		// We are directly storing the record values here, so ensure
 		// everything is formatted in the same manner as it would be