diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp
index 1fd6f89df..28f394d85 100644
--- a/src/mbgl/map/map_context.cpp
+++ b/src/mbgl/map/map_context.cpp
@@ -298,7 +298,7 @@ void MapContext::updateTiles() {
 }
 
 void MapContext::updateAnnotationTiles(const std::vector<TileID>& ids) {
-    assert(Environment::currentlyOn(ThreadType::Main));
+    assert(Environment::currentlyOn(ThreadType::Map));
     if (!style) return;
     for (const auto &source : style->sources) {
         if (source->info.type == SourceType::Annotations) {
diff --git a/src/mbgl/map/map_context.hpp b/src/mbgl/map/map_context.hpp
index e9e61844c..fd9347e61 100644
--- a/src/mbgl/map/map_context.hpp
+++ b/src/mbgl/map/map_context.hpp
@@ -57,13 +57,11 @@ public:
         return promise.get_future().get();
     }
 
+    void updateAnnotationTiles(const std::vector<TileID>& ids);
     double getTopOffsetPixelsForAnnotationSymbol(const std::string& symbol);
     void setSourceTileCacheSize(size_t size);
     void onLowMemory();
 
-    // TODO: Make this private
-    public: void updateAnnotationTiles(const std::vector<TileID>& ids);
-
     // These can only be called from the Map thread.
 private:
     // Checks if render thread needs to pause