diff --git a/ui/src/app/shared/components/editable-panel/editable-panel.tsx b/ui/src/app/shared/components/editable-panel/editable-panel.tsx
index 08b843ec8e..d8951f07d2 100644
--- a/ui/src/app/shared/components/editable-panel/editable-panel.tsx
+++ b/ui/src/app/shared/components/editable-panel/editable-panel.tsx
@@ -38,7 +38,7 @@ export class EditablePanel<T = {}> extends React.Component<EditablePanelProps<T>
     }
 
     public UNSAFE_componentWillReceiveProps(nextProps: EditablePanelProps<T>) {
-        if (JSON.stringify(this.props.values) !== JSON.stringify(nextProps.values)) {
+        if (this.formApi && JSON.stringify(this.props.values) !== JSON.stringify(nextProps.values)) {
             this.formApi.setAllValues(nextProps.values);
         }
     }