diff --git a/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.txx b/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.txx
index dc934b18aba2bf5ac6336a3a1972a7116c33a392..0f7b6f2b4e85cd17f6f9ef0083917de88eca88bc 100644
--- a/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.txx
+++ b/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.txx
@@ -135,7 +135,8 @@ void
 EuclideanDistanceWithMissingValue< TVector >
 ::SetToMissingValue ( ValueType & v )
 {
-	v = static_cast<ValueType>( 0.0/0.0 );
+  //v = static_cast<ValueType>( 0.0/0.0 );
+  v = std::numeric_limits<ValueType>::quiet_NaN();
 }