diff --git a/public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx b/public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx
index 874516506e0..167ba484b6e 100644
--- a/public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx
+++ b/public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx
@@ -67,6 +67,11 @@ export function PartitionByValuesEditor({
     { label: 'As frame name', value: namingModes.frameName },
   ];
 
+  const KeepFieldsOptions = [
+    { label: 'Yes', value: true },
+    { label: 'No', value: false },
+  ];
+
   const removeField = useCallback(
     (v: string) => {
       if (!v) {
@@ -135,6 +140,15 @@ export function PartitionByValuesEditor({
           />
         </InlineField>
       </InlineFieldRow>
+      <InlineFieldRow>
+        <InlineField tooltip={'Keeps the partition fields in the frames.'} label={'Keep fields'} labelWidth={16}>
+          <RadioButtonGroup
+            options={KeepFieldsOptions}
+            value={options.keepFields}
+            onChange={(v) => onChange({ ...options, keepFields: v })}
+          />
+        </InlineField>
+      </InlineFieldRow>
     </div>
   );
 }
diff --git a/public/app/features/transformers/partitionByValues/partitionByValues.ts b/public/app/features/transformers/partitionByValues/partitionByValues.ts
index d33d00f04c7..8368d24806d 100644
--- a/public/app/features/transformers/partitionByValues/partitionByValues.ts
+++ b/public/app/features/transformers/partitionByValues/partitionByValues.ts
@@ -67,7 +67,9 @@ export const partitionByValuesTransformer: SynchronousDataTransformerInfo<Partit
   id: DataTransformerID.partitionByValues,
   name: 'Partition by values',
   description: `Splits a one-frame dataset into multiple series discriminated by unique/enum values in one or more fields.`,
-  defaultOptions: {},
+  defaultOptions: {
+    keepFields: false,
+  },
 
   operator: (options, ctx) => (source) =>
     source.pipe(map((data) => partitionByValuesTransformer.transformer(options, ctx)(data))),