diff --git a/Modules/Visualization/MonteverdiCore/src/mvdStackedLayerModel.cxx b/Modules/Visualization/MonteverdiCore/src/mvdStackedLayerModel.cxx
index 7118fb34023ae2c973933a4e3e3d0702fa9e8a29..482ed115167ad51c55084fb6843009f91c5c709b 100644
--- a/Modules/Visualization/MonteverdiCore/src/mvdStackedLayerModel.cxx
+++ b/Modules/Visualization/MonteverdiCore/src/mvdStackedLayerModel.cxx
@@ -253,7 +253,7 @@ StackedLayerModel
     ? m_Current
     : ( m_Current>0
         ? m_Current - 1
-        : StackedLayerModel::NIL_INDEX );
+        : GetCount()>0 ? 0 : StackedLayerModel::NIL_INDEX );
 
   //
   // Emit signals.
@@ -287,7 +287,7 @@ StackedLayerModel
       ? m_Reference
       : ( m_Reference > 0
 	  ? m_Reference - 1
-	  : StackedLayerModel::NIL_INDEX ),
+          : GetCount() > 0 ? 0 : StackedLayerModel::NIL_INDEX ),
       true
     );