diff --git a/public/app/features/transformers/editors/GroupingToMatrixTransformerEditor.tsx b/public/app/features/transformers/editors/GroupingToMatrixTransformerEditor.tsx
index ddf0eab1bc9..9ccd7c82b9f 100644
--- a/public/app/features/transformers/editors/GroupingToMatrixTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/GroupingToMatrixTransformerEditor.tsx
@@ -23,7 +23,7 @@ export const GroupingToMatrixTransformerEditor: React.FC<TransformerUIProps<Grou
     (value: SelectableValue<string>) => {
       onChange({
         ...options,
-        columnField: value.value,
+        columnField: value?.value,
       });
     },
     [onChange, options]
@@ -33,7 +33,7 @@ export const GroupingToMatrixTransformerEditor: React.FC<TransformerUIProps<Grou
     (value: SelectableValue<string>) => {
       onChange({
         ...options,
-        rowField: value.value,
+        rowField: value?.value,
       });
     },
     [onChange, options]
@@ -43,7 +43,7 @@ export const GroupingToMatrixTransformerEditor: React.FC<TransformerUIProps<Grou
     (value: SelectableValue<string>) => {
       onChange({
         ...options,
-        valueField: value.value,
+        valueField: value?.value,
       });
     },
     [onChange, options]
diff --git a/public/app/features/transformers/editors/SeriesToFieldsTransformerEditor.tsx b/public/app/features/transformers/editors/SeriesToFieldsTransformerEditor.tsx
index 829d9713f63..79bdf28a027 100644
--- a/public/app/features/transformers/editors/SeriesToFieldsTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/SeriesToFieldsTransformerEditor.tsx
@@ -23,7 +23,7 @@ export const SeriesToFieldsTransformerEditor: React.FC<TransformerUIProps<Series
     (value: SelectableValue<string>) => {
       onChange({
         ...options,
-        byField: value.value,
+        byField: value?.value,
       });
     },
     [onChange, options]