diff --git a/packages/grafana-data/src/panel/PanelPlugin.ts b/packages/grafana-data/src/panel/PanelPlugin.ts
index 6b8331e31e6..de4d147ea52 100644
--- a/packages/grafana-data/src/panel/PanelPlugin.ts
+++ b/packages/grafana-data/src/panel/PanelPlugin.ts
@@ -168,7 +168,11 @@ export class PanelPlugin<TOptions = any, TFieldConfigOptions extends object = an
     return this._optionEditors;
   }
 
+  /**
+   * @deprecated setEditor is deprecated in favor of setPanelOptions
+   */
   setEditor(editor: ComponentClass<PanelEditorProps<TOptions>>) {
+    deprecationWarning('PanelPlugin', 'setEditor', 'setPanelOptions');
     this.editor = editor;
     return this;
   }