diff --git a/drape/index_buffer_mutator.cpp b/drape/index_buffer_mutator.cpp
index b0d5858416..4a0da796ad 100644
--- a/drape/index_buffer_mutator.cpp
+++ b/drape/index_buffer_mutator.cpp
@@ -33,4 +33,9 @@ uint32_t IndexBufferMutator::GetIndexCount() const
   return m_activeSize;
 }
 
+uint32_t IndexBufferMutator::GetCapacity() const
+{
+  return m_buffer.Size();
+}
+
 } // namespace dp
diff --git a/drape/index_buffer_mutator.hpp b/drape/index_buffer_mutator.hpp
index 978cb29014..9a63a44f45 100644
--- a/drape/index_buffer_mutator.hpp
+++ b/drape/index_buffer_mutator.hpp
@@ -17,6 +17,8 @@ public:
 
   void AppendIndexes(void const * indexes, uint32_t count);
 
+  uint32_t GetCapacity() const;
+
 private:
   friend class VertexArrayBuffer;
   void const * GetIndexes() const;
diff --git a/drape/vertex_array_buffer.cpp b/drape/vertex_array_buffer.cpp
index 1b2331da54..594f990a48 100644
--- a/drape/vertex_array_buffer.cpp
+++ b/drape/vertex_array_buffer.cpp
@@ -206,6 +206,11 @@ void VertexArrayBuffer::ApplyMutation(ref_ptr<IndexBufferMutator> indexMutator,
   if (indexMutator != nullptr)
   {
     ASSERT(m_indexBuffer != nullptr, ());
+    if (indexMutator->GetCapacity() > m_indexBuffer->GetBuffer()->GetCapacity())
+    {
+      m_indexBuffer = make_unique_dp<IndexBuffer>(indexMutator->GetCapacity());
+      m_indexBuffer->MoveToGPU(GPUBuffer::IndexBuffer);
+    }
     m_indexBuffer->UpdateData(indexMutator->GetIndexes(), indexMutator->GetIndexCount());
   }