diff --git a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
index b446a9ef56..7503c59d65 100644
--- a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
@@ -317,7 +317,12 @@ public:
 
             for (size_t cellIdx = 0; static_cast<size_t>(cellIdx) < rigGrid->cellCount(); cellIdx++)
             {
-                values[cellIdx] = cellCenterDataAccessObject->cellScalar(cellIdx);
+                double cellValue = cellCenterDataAccessObject->cellScalar(cellIdx);
+                if (cellValue == HUGE_VAL)
+                {
+                    cellValue = 0.0;
+                }
+                values[cellIdx] = cellValue;
             }
         }