diff --git a/public/app/plugins/panel/xychart/v2/SeriesEditor.tsx b/public/app/plugins/panel/xychart/v2/SeriesEditor.tsx
index 74f7ae22494..b76b0d16b66 100644
--- a/public/app/plugins/panel/xychart/v2/SeriesEditor.tsx
+++ b/public/app/plugins/panel/xychart/v2/SeriesEditor.tsx
@@ -31,13 +31,16 @@ export const SeriesEditor = ({
   const mappingChanged = prevMapping != null && mapping !== prevMapping;
 
   const defaultFrame = { frame: { matcher: { id: FrameMatcherID.byIndex, options: 0 } } };
+  const [selectedIdx, setSelectedIdx] = useState(0);
 
   if (mappingChanged || seriesCfg == null) {
     seriesCfg = [{ ...defaultFrame }];
     onChange([...seriesCfg]);
-  }
 
-  const [selectedIdx, setSelectedIdx] = useState(0);
+    if (selectedIdx > 0) {
+      setSelectedIdx(0);
+    }
+  }
 
   const addSeries = () => {
     seriesCfg = seriesCfg.concat({ ...defaultFrame });