diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp
index f1f5844dc7..f792aa3d40 100644
--- a/drape_frontend/drape_engine.cpp
+++ b/drape_frontend/drape_engine.cpp
@@ -418,9 +418,7 @@ void DrapeEngine::RecacheMapShapes()
 
 dp::DrapeID DrapeEngine::GenerateDrapeID()
 {
-  std::lock_guard<std::mutex> lock(m_drapeIdGeneratorMutex);
-  ++m_drapeIdGenerator;
-  return m_drapeIdGenerator;
+  return ++m_drapeIdGenerator;
 }
 
 void DrapeEngine::RecacheGui(bool needResetOldGui)
diff --git a/drape_frontend/drape_engine.hpp b/drape_frontend/drape_engine.hpp
index 54bf1f0011..7f1f3eaaec 100644
--- a/drape_frontend/drape_engine.hpp
+++ b/drape_frontend/drape_engine.hpp
@@ -29,9 +29,9 @@
 
 #include "base/strings_bundle.hpp"
 
+#include <atomic>
 #include <functional>
 #include <map>
-#include <mutex>
 #include <utility>
 #include <vector>
 
@@ -289,8 +289,7 @@ private:
   bool m_choosePositionMode = false;
   bool m_kineticScrollEnabled = true;
 
-  std::mutex m_drapeIdGeneratorMutex;
-  dp::DrapeID m_drapeIdGenerator = 0;
+  std::atomic<dp::DrapeID> m_drapeIdGenerator = 0;
 
   friend class DrapeApi;
 };