diff --git a/src/EditorControls.js b/src/EditorControls.js
index 97e3dcc66..e181dba52 100644
--- a/src/EditorControls.js
+++ b/src/EditorControls.js
@@ -1,7 +1,7 @@
 import DefaultEditor from './DefaultEditor';
 import PropTypes from 'prop-types';
 import React, {Component} from 'react';
-import {bem, localizeString} from './lib';
+import {bem, localizeString, plotlyTraceToCustomTrace, traceTypeToPlotlyInitFigure} from './lib';
 import {
   shamefullyClearAxisTypes,
   shamefullyAdjustAxisRef,
@@ -143,14 +143,22 @@ class EditorControls extends Component {
 
         // can't use default prop because plotly.js mutates it:
         // https://github.com/plotly/react-chart-editor/issues/509
-        graphDiv.data.push(
-          this.props.makeDefaultTrace
-            ? this.props.makeDefaultTrace()
-            : {
-                type: `scatter${this.props.glByDefault ? 'gl' : ''}`,
-                mode: 'markers',
-              }
-        );
+        if (graphDiv.data.length === 0) {
+          graphDiv.data.push(
+            this.props.makeDefaultTrace
+              ? this.props.makeDefaultTrace()
+              : {
+                  type: `scatter${this.props.glByDefault ? 'gl' : ''}`,
+                  mode: 'markers',
+                }
+          );
+        } else {
+          const prevTrace = graphDiv.data[graphDiv.data.length - 1];
+          const prevTraceType = plotlyTraceToCustomTrace(prevTrace);
+          graphDiv.data.push(
+            traceTypeToPlotlyInitFigure(prevTraceType, prevTrace.type.endsWith('gl') ? 'gl' : '')
+          );
+        }
 
         if (this.props.afterAddTrace) {
           this.props.afterAddTrace(payload);
diff --git a/src/components/fields/__tests__/TraceSelector-test.js b/src/components/fields/__tests__/TraceSelector-test.js
index 2b9c40322..53ee84033 100644
--- a/src/components/fields/__tests__/TraceSelector-test.js
+++ b/src/components/fields/__tests__/TraceSelector-test.js
@@ -141,7 +141,7 @@ describe('TraceSelector', () => {
 
     const payload = beforeUpdateTraces.mock.calls[0][0];
     expect(payload.update).toEqual({
-      fill: 'none',
+      stackgroup: null,
       mode: 'lines',
       type: 'scatter',
     });
diff --git a/src/lib/customTraceType.js b/src/lib/customTraceType.js
index 42859c0a9..93ce07be5 100644
--- a/src/lib/customTraceType.js
+++ b/src/lib/customTraceType.js
@@ -34,9 +34,9 @@ export function plotlyTraceToCustomTrace(trace) {
 export function traceTypeToPlotlyInitFigure(traceType, gl = '') {
   switch (traceType) {
     case 'line':
-      return {type: 'scatter' + gl, mode: 'lines', fill: 'none'};
+      return {type: 'scatter' + gl, mode: 'lines', stackgroup: null};
     case 'scatter':
-      return {type: 'scatter' + gl, mode: 'markers', fill: 'none'};
+      return {type: 'scatter' + gl, mode: 'markers', stackgroup: null};
     case 'area':
       return {type: 'scatter' + gl, mode: 'lines', stackgroup: 1};
     case 'scatterpolar':