diff --git a/src/traces/bar/style.js b/src/traces/bar/style.js
index b5a587d8988..df30b7c3850 100644
--- a/src/traces/bar/style.js
+++ b/src/traces/bar/style.js
@@ -158,7 +158,7 @@ function getBarColor(cd, trace) {
     if(trace.type === 'waterfall') {
         return trace[cd.dir].marker.color;
     }
-    return cd.mc || trace.marker.color;
+    return cd.mcc || cd.mc || trace.marker.color;
 }
 
 module.exports = {
diff --git a/test/image/baselines/bar-colorscale-colorbar.png b/test/image/baselines/bar-colorscale-colorbar.png
index 371fcece1a2..306baed1e12 100644
Binary files a/test/image/baselines/bar-colorscale-colorbar.png and b/test/image/baselines/bar-colorscale-colorbar.png differ
diff --git a/test/image/mocks/bar-colorscale-colorbar.json b/test/image/mocks/bar-colorscale-colorbar.json
index ded7348e948..1c5906d1afc 100644
--- a/test/image/mocks/bar-colorscale-colorbar.json
+++ b/test/image/mocks/bar-colorscale-colorbar.json
@@ -2,6 +2,10 @@
     "data": [
         {
             "type": "bar",
+            "textfont": {
+                "size": 24
+            },
+            "texttemplate": "%{y}",
             "y": [
                 1,
                 2,