diff --git a/CHANGELOG.md b/CHANGELOG.md
index a36169451..da9cf5f21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#586](https://github.com/equinor/webviz-subsurface/pull/586) - Added phase ratio vs pressure and density vs pressure plots. Added unit and density functions to PVT library. Refactored code and added checklist for plots to be viewed in PVT plot plugin. Improved the layout.
 
 ### Fixed
+- [#594](https://github.com/equinor/webviz-subsurface/pull/594) - Fixed bug in SurfaceViewerFMU where surfaces with only undefined values was not handled properly.
 - [#584](https://github.com/equinor/webviz-subsurface/pull/584) - Fixed bug for in RelativePermeability plugin where it was not possible to plot against oil saturation axis when using relperm data of "family 2".
 
 ## [0.1.9] - 2021-02-23
diff --git a/webviz_subsurface/_models/surface_leaflet_model.py b/webviz_subsurface/_models/surface_leaflet_model.py
index e92b9826b..93862ecde 100644
--- a/webviz_subsurface/_models/surface_leaflet_model.py
+++ b/webviz_subsurface/_models/surface_leaflet_model.py
@@ -80,6 +80,9 @@ def get_zvalues(
         values = surface.values
         if flip:
             values = np.flip(values.transpose(), axis=0)
+        # If all values are masked set to zero
+        if values.mask.all():
+            values = np.zeros(values.shape)
         return values
 
     @property