diff --git a/packages/grafana-data/src/types/fieldOverrides.ts b/packages/grafana-data/src/types/fieldOverrides.ts
index 3a6757b2640..335b3e2d5d9 100644
--- a/packages/grafana-data/src/types/fieldOverrides.ts
+++ b/packages/grafana-data/src/types/fieldOverrides.ts
@@ -37,7 +37,7 @@ export interface FieldOverrideContext extends StandardEditorContext<any> {
 }
 export interface FieldConfigEditorProps<TValue, TSettings>
   extends Omit<StandardEditorProps<TValue, TSettings>, 'item'> {
-  item: FieldConfigPropertyItem<TValue, TSettings>; // The property info
+  item: FieldConfigPropertyItem<any, TValue, TSettings>; // The property info
   value: TValue;
   context: FieldOverrideContext;
   onChange: (value?: TValue) => void;
diff --git a/packages/grafana-ui/src/components/OptionsUI/color.tsx b/packages/grafana-ui/src/components/OptionsUI/color.tsx
index 178ccef8812..2b907cd10fb 100644
--- a/packages/grafana-ui/src/components/OptionsUI/color.tsx
+++ b/packages/grafana-ui/src/components/OptionsUI/color.tsx
@@ -23,7 +23,7 @@ export const ColorValueEditor: React.FC<FieldConfigEditorProps<string, ColorFiel
   const color = value || (item.defaultValue as string) || theme.colors.panelBg;
 
   return (
-    <ColorPicker color={color} onChange={onChange} enableNamedColors={!settings.disableNamedColors}>
+    <ColorPicker color={color} onChange={onChange} enableNamedColors={!settings?.disableNamedColors}>
       {({ ref, showColorPicker, hideColorPicker }) => {
         return (
           <div className={styles.spot} onBlur={hideColorPicker}>
@@ -36,9 +36,9 @@ export const ColorValueEditor: React.FC<FieldConfigEditorProps<string, ColorFiel
               />
             </div>
             <div className={styles.colorText} onClick={showColorPicker}>
-              {value ?? settings.textWhenUndefined ?? 'Pick Color'}
+              {value ?? settings?.textWhenUndefined ?? 'Pick Color'}
             </div>
-            {value && settings.allowUndefined && (
+            {value && settings?.allowUndefined && (
               <Icon className={styles.trashIcon} name="trash-alt" onClick={() => onChange(undefined)} />
             )}
           </div>
diff --git a/packages/grafana-ui/src/components/OptionsUI/select.tsx b/packages/grafana-ui/src/components/OptionsUI/select.tsx
index 5f83109f6fe..46a2739490a 100644
--- a/packages/grafana-ui/src/components/OptionsUI/select.tsx
+++ b/packages/grafana-ui/src/components/OptionsUI/select.tsx
@@ -24,7 +24,7 @@ export class SelectValueEditor<T> extends React.PureComponent<Props<T>, State<T>
     const now = this.props.item?.settings;
     if (old !== now) {
       this.updateOptions();
-    } else if (now.getOptions) {
+    } else if (now?.getOptions) {
       const old = oldProps.context?.data;
       const now = this.props.context?.data;
       if (old !== now) {
@@ -53,7 +53,6 @@ export class SelectValueEditor<T> extends React.PureComponent<Props<T>, State<T>
     const { value, onChange, item } = this.props;
 
     const { settings } = item;
-    const { allowCustomValue } = settings;
     let current = options.find(v => v.value === value);
     if (!current && value) {
       current = {
@@ -66,7 +65,7 @@ export class SelectValueEditor<T> extends React.PureComponent<Props<T>, State<T>
         isLoading={isLoading}
         value={current}
         defaultValue={value}
-        allowCustomValue={allowCustomValue}
+        allowCustomValue={settings?.allowCustomValue}
         onChange={e => onChange(e.value)}
         options={options}
       />
diff --git a/packages/grafana-ui/src/components/OptionsUI/string.tsx b/packages/grafana-ui/src/components/OptionsUI/string.tsx
index c5ddcc3028d..9fca0fbb220 100644
--- a/packages/grafana-ui/src/components/OptionsUI/string.tsx
+++ b/packages/grafana-ui/src/components/OptionsUI/string.tsx
@@ -31,7 +31,7 @@ export const StringValueEditor: React.FC<FieldConfigEditorProps<string, StringFi
     <Component
       placeholder={item.settings?.placeholder}
       defaultValue={value || ''}
-      rows={item.settings?.useTextarea && item.settings.rows}
+      rows={(item.settings?.useTextarea && item.settings.rows) || 5}
       onBlur={onValueChange}
       onKeyDown={onValueChange}
     />