diff --git a/src/render/draw_heatmap.js b/src/render/draw_heatmap.js
index 0b95f92b9e1..65100cd9f77 100644
--- a/src/render/draw_heatmap.js
+++ b/src/render/draw_heatmap.js
@@ -148,6 +148,7 @@ function renderTextureToMap(painter, layer) {
     colorRampTexture.bind(gl.LINEAR, gl.CLAMP_TO_EDGE);
 
     context.setDepthMode(DepthMode.disabled);
+    context.setStencilMode(StencilMode.disabled);
 
     const program = painter.useProgram('heatmapTexture');
 
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#6806/expected.png b/test/integration/render-tests/regressions/mapbox-gl-js#6806/expected.png
new file mode 100644
index 00000000000..11c42091c4e
Binary files /dev/null and b/test/integration/render-tests/regressions/mapbox-gl-js#6806/expected.png differ
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#6806/style.json b/test/integration/render-tests/regressions/mapbox-gl-js#6806/style.json
new file mode 100644
index 00000000000..d67837a09b1
--- /dev/null
+++ b/test/integration/render-tests/regressions/mapbox-gl-js#6806/style.json
@@ -0,0 +1,47 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "height": 64,
+      "width": 64,
+      "description": "Contains two expected images (for ubyte-based rendering and half-float-based); one of them should pass depending on platform."
+    }
+  },
+  "center": [
+    13.418056,
+    52.4963
+  ],
+  "zoom": 14,
+  "sources": {
+    "mapbox": {
+      "type": "vector",
+      "maxzoom": 14,
+      "tiles": [
+        "local://tiles/{z}-{x}-{y}.mvt"
+      ]
+    }
+  },
+  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "white"
+      }
+    },
+    {
+      "id": "fill",
+      "type": "fill",
+      "source": "mapbox",
+      "source-layer": "building"
+    },
+    {
+      "id": "poi_heat",
+      "type": "heatmap",
+      "source": "mapbox",
+      "source-layer": "poi_label",
+      "paint": {}
+    }
+  ]
+}