diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp
index e6d8b389e..6a1779117 100644
--- a/src/mbgl/map/map_context.cpp
+++ b/src/mbgl/map/map_context.cpp
@@ -233,9 +233,6 @@ bool MapContext::renderSync(const TransformState& state, const FrameData& frame)
 
     transformState = state;
 
-    // Cleanup OpenGL objects that we abandoned since the last render call.
-    glObjectStore.performCleanup();
-
     if (!painter) painter = std::make_unique<Painter>(data, transformState, glObjectStore);
     painter->render(*style, frame, data.getAnnotationManager()->getSpriteAtlas());
 
@@ -244,6 +241,9 @@ bool MapContext::renderSync(const TransformState& state, const FrameData& frame)
         callback = nullptr;
     }
 
+    // Cleanup OpenGL objects that we abandoned since the last render call.
+    glObjectStore.performCleanup();
+
     view.afterRender();
 
     if (style->hasTransitions()) {