diff --git a/src/traces/surface/convert.js b/src/traces/surface/convert.js
index 31fd3685e9e..839c0b8b700 100644
--- a/src/traces/surface/convert.js
+++ b/src/traces/surface/convert.js
@@ -262,7 +262,7 @@ proto.update = function(data) {
         dynamicColor: [[1, 1, 1, 1], [1, 1, 1, 1], [1, 1, 1, 1]],
         dynamicWidth: [1, 1, 1],
         dynamicTint: [1, 1, 1],
-        opacity: 1
+        opacity: data.opacity
     };
 
     params.intensityBounds = [data.cmin, data.cmax];
@@ -290,12 +290,6 @@ proto.update = function(data) {
         params.intensity = coords.pop();
     }
 
-    if('opacity' in data) {
-        if(data.opacity < 1) {
-            params.opacity = 0.25 * data.opacity;
-        }
-    }
-
     var highlightEnable = [true, true, true];
     var axis = ['x', 'y', 'z'];
 
diff --git a/test/image/baselines/gl3d_opacity-surface.png b/test/image/baselines/gl3d_opacity-surface.png
index f5774c2a756..ac6e2fd016c 100644
Binary files a/test/image/baselines/gl3d_opacity-surface.png and b/test/image/baselines/gl3d_opacity-surface.png differ