diff --git a/src/plots/mapbox/mapbox.js b/src/plots/mapbox/mapbox.js
index 04bd1ba01f4..bee610b70eb 100644
--- a/src/plots/mapbox/mapbox.js
+++ b/src/plots/mapbox/mapbox.js
@@ -212,7 +212,7 @@ proto.updateData = function(calcData) {
         traceObj = traceHash[trace.uid];
 
         if(traceObj) traceObj.update(calcTrace);
-        else {
+        else if(trace._module) {
             traceHash[trace.uid] = trace._module.plot(this, calcTrace);
         }
     }
diff --git a/test/jasmine/tests/mapbox_test.js b/test/jasmine/tests/mapbox_test.js
index 29df105616f..f0fe06c5b25 100644
--- a/test/jasmine/tests/mapbox_test.js
+++ b/test/jasmine/tests/mapbox_test.js
@@ -295,6 +295,12 @@ describe('mapbox plots', function() {
         }).then(function() {
             expect(countVisibleTraces(gd, modes)).toEqual(2);
 
+            mock.data[0].visible = false;
+
+            return Plotly.newPlot(gd, mock.data, mock.layout);
+        }).then(function() {
+            expect(countVisibleTraces(gd, modes)).toEqual(1);
+
             done();
         });
     });