diff --git a/drape/batcher.cpp b/drape/batcher.cpp
index 1f4cdc1ea9..aa7a67e670 100644
--- a/drape/batcher.cpp
+++ b/drape/batcher.cpp
@@ -196,6 +196,12 @@ void Batcher::EndSession()
   m_flushInterface = TFlushFn();
 }
 
+void Batcher::ResetSession()
+{
+  m_flushInterface = TFlushFn();
+  m_buckets.clear();
+}
+
 void Batcher::SetFeatureMinZoom(int minZoom)
 {
   m_featureMinZoom = minZoom;
diff --git a/drape/batcher.hpp b/drape/batcher.hpp
index 18eeac31d6..f3c3839aa0 100644
--- a/drape/batcher.hpp
+++ b/drape/batcher.hpp
@@ -57,6 +57,7 @@ public:
   typedef function<void (GLState const &, drape_ptr<RenderBucket> &&)> TFlushFn;
   void StartSession(TFlushFn const & flusher);
   void EndSession();
+  void ResetSession();
 
   void SetFeatureMinZoom(int minZoom);
 
diff --git a/drape_frontend/batchers_pool.hpp b/drape_frontend/batchers_pool.hpp
index 8b14fb09fe..fc28e964c5 100644
--- a/drape_frontend/batchers_pool.hpp
+++ b/drape_frontend/batchers_pool.hpp
@@ -28,7 +28,11 @@ public:
   ~BatchersPool()
   {
     for (auto const & p : m_batchers)
-      m_pool.Return(p.second.first);
+    {
+      dp::Batcher * batcher = p.second.first;
+      batcher->ResetSession();
+      m_pool.Return(batcher);
+    }
 
     m_batchers.clear();
   }
diff --git a/drape_frontend/message_subclasses.hpp b/drape_frontend/message_subclasses.hpp
index cba546bc12..9883588f29 100644
--- a/drape_frontend/message_subclasses.hpp
+++ b/drape_frontend/message_subclasses.hpp
@@ -1047,7 +1047,6 @@ public:
   {}
 
   Type GetType() const override { return Message::UpdateTraffic; }
-  bool IsGLContextDependent() const override { return true; }
 
   TrafficSegmentsColoring & GetSegmentsColoring() { return m_segmentsColoring; }