diff --git a/kv/bucket.go b/kv/bucket.go
index 8fba4ea198..017fb5fe4b 100644
--- a/kv/bucket.go
+++ b/kv/bucket.go
@@ -189,6 +189,7 @@ func (s *Service) findBucketByName(ctx context.Context, tx Tx, orgID influxdb.ID
 				Name:            influxdb.TasksSystemBucketName,
 				RetentionPeriod: influxdb.TasksSystemBucketRetention,
 				Description:     "System bucket for task logs",
+				OrgID:           orgID,
 			}, nil
 		case influxdb.MonitoringSystemBucketName:
 			return &influxdb.Bucket{
@@ -197,6 +198,7 @@ func (s *Service) findBucketByName(ctx context.Context, tx Tx, orgID influxdb.ID
 				Name:            influxdb.MonitoringSystemBucketName,
 				RetentionPeriod: influxdb.MonitoringSystemBucketRetention,
 				Description:     "System bucket for monitoring logs",
+				OrgID:           orgID,
 			}, nil
 		default:
 			return nil, &influxdb.Error{