diff --git a/tsdb/shard.go b/tsdb/shard.go
index 5535829f1a..c37eb01246 100644
--- a/tsdb/shard.go
+++ b/tsdb/shard.go
@@ -2127,8 +2127,8 @@ func marshalFieldChanges(changeSet ...FieldChanges) ([]byte, error) {
 			for _, f := range fc {
 				fields = append(fields, fmt.Sprintf("%q.%q", f.Measurement, f.Field.Name))
 			}
-			return nil, fmt.Errorf("failed marshaling new fields - %s: %w", strings.Join(fields, ", "), err)
 		}
+		return nil, fmt.Errorf("failed marshaling new fields - %s: %w", strings.Join(fields, ", "), err)
 	}
 	return b, nil
 }