diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbDEMHandler.cxx b/Code/UtilitiesAdapters/OssimAdapters/otbDEMHandler.cxx
index 80e38c396a6885e5562ba4ab6ad32fb6d3e9aa6f..13e7fdf189bd626a97431b97b8eafb113416b470 100644
--- a/Code/UtilitiesAdapters/OssimAdapters/otbDEMHandler.cxx
+++ b/Code/UtilitiesAdapters/OssimAdapters/otbDEMHandler.cxx
@@ -58,6 +58,8 @@ DEMHandler
   m_DefaultHeightAboveEllipsoid(0)
 {
   m_ElevManager->setDefaultHeightAboveEllipsoid(m_DefaultHeightAboveEllipsoid);
+  // Force geoid fallback
+  m_ElevManager->setUseGeoidIfNullFlag(true);
 }
 
 void
@@ -105,8 +107,6 @@ DEMHandler
       ossimGeoidManager::instance()->addGeoid(geoidPtr);
       geoidPtr.release();
 
-      // Force geoid fallback
-      m_ElevManager->setUseGeoidIfNullFlag(true);
       // The previous flag will be ignored if
       // defaultHeightAboveEllipsoid is not NaN
       m_ElevManager->setDefaultHeightAboveEllipsoid(ossim::nan());
diff --git a/Testing/Code/UtilitiesAdapters/CMakeLists.txt b/Testing/Code/UtilitiesAdapters/CMakeLists.txt
index 7443424d93976e0d8189f782392bb8a74c063835..cbc2f92aaf98b0ba56e0184e463526e7fd5cb6b0 100644
--- a/Testing/Code/UtilitiesAdapters/CMakeLists.txt
+++ b/Testing/Code/UtilitiesAdapters/CMakeLists.txt
@@ -161,7 +161,7 @@ ADD_TEST(uaTvDEMHandler_AboveMSL_NoSRTM_Geoid
   8.434583
   44.647083
   1
-  -5.7464
+  0
   0.001
 )
 
@@ -188,7 +188,7 @@ ADD_TEST(uaTvDEMHandler_AboveMSL_NoSRTM_NoGeoid
   8.434583
   44.647083
   1
-  40
+  0
   0.001
 )
 
@@ -215,7 +215,7 @@ ADD_TEST(uaTvDEMHandler_AboveMSL_SRTM_Geoid_NoData
   8.687917
   44.237917
   1
-  -5.7464
+  0
   0.001
 )
 
@@ -241,7 +241,7 @@ ADD_TEST(uaTvDEMHandler_AboveMSL_SRTM_NoGeoid_NoData
   8.687917
   44.237917
   1
-  40
+  0
   0.001
 )
 
@@ -267,7 +267,7 @@ ADD_TEST(uaTvDEMHandler_AboveMSL_NoSRTM_NoGeoid_NoData
   8.687917
   44.237917
   1
-  40
+  0
   0.001
 )
 
@@ -294,7 +294,7 @@ ADD_TEST(uaTvDEMHandler_AboveMSL_SRTM_Geoid_NoSRTMCoverage
   10. # Point not covered
   10. # Point not covered
   1
-  -1.569
+  0
   0.001
 )
 
@@ -320,7 +320,7 @@ ADD_TEST(uaTvDEMHandler_AboveMSL_SRTM_NoGeoid_NoSRTMCoverage
   10. # Point not covered
   10. # Point not covered
   1
-  20
+  0
   0.001
 )