diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
index e408618cd5..edf4bf0ceb 100755
--- a/drape_frontend/frontend_renderer.cpp
+++ b/drape_frontend/frontend_renderer.cpp
@@ -501,14 +501,15 @@ void FrontendRenderer::RenderScene(ScreenBase const & modelView)
     SelectionShape::ESelectedObject selectedObject = m_selectionShape->GetSelectedObject();
     if (selectedObject == SelectionShape::OBJECT_MY_POSITION)
     {
-      GLFunctions::glClearDepth();
-      m_myPositionController->Render(modelView, make_ref(m_gpuProgramManager), m_generalUniforms);
-      m_routeRenderer->Render(modelView, make_ref(m_gpuProgramManager), m_generalUniforms);
+      ASSERT(m_myPositionController->IsModeHasPosition(), ());
+      m_selectionShape->SetPosition(m_myPositionController->Position());
+      m_selectionShape->Render(modelView, make_ref(m_gpuProgramManager), m_generalUniforms);
     }
     else if (selectedObject == SelectionShape::OBJECT_POI)
       m_selectionShape->Render(modelView, make_ref(m_gpuProgramManager), m_generalUniforms);
   }
 
+  m_routeRenderer->Render(modelView, make_ref(m_gpuProgramManager), m_generalUniforms);
   m_myPositionController->Render(modelView, make_ref(m_gpuProgramManager), m_generalUniforms);
 
   for (; currentRenderGroup < m_renderGroups.size(); ++currentRenderGroup)
diff --git a/drape_frontend/message.hpp b/drape_frontend/message.hpp
index ac0b0a3c25..dcfbc2cc2a 100644
--- a/drape_frontend/message.hpp
+++ b/drape_frontend/message.hpp
@@ -30,7 +30,7 @@ public:
     CompassInfo,
     GpsInfo,
     FindVisiblePOI,
-    SelectObject
+    SelectObject,
     GetMyPosition,
     AddRoute,
     RemoveRoute,