diff --git a/src/common/rendering/hwrenderer/data/hw_viewpointbuffer.cpp b/src/common/rendering/hwrenderer/data/hw_viewpointbuffer.cpp
index 471ee1cb6..fabd0257c 100644
--- a/src/common/rendering/hwrenderer/data/hw_viewpointbuffer.cpp
+++ b/src/common/rendering/hwrenderer/data/hw_viewpointbuffer.cpp
@@ -126,6 +126,8 @@ void HWViewpointBuffer::Clear()
 
 	if (needNewPipeline)
 	{
+		mLastMappedIndex = UINT_MAX;
+
 		mPipelinePos++;
 		mPipelinePos %= mPipelineNbr;
 	}