diff --git a/src/mbgl/actor/scheduler.cpp b/src/mbgl/actor/scheduler.cpp
index f2f70bd79b2..515a777848e 100644
--- a/src/mbgl/actor/scheduler.cpp
+++ b/src/mbgl/actor/scheduler.cpp
@@ -14,18 +14,16 @@ std::function<void()> Scheduler::bindOnce(std::function<void()> fn) {
 }
 
 namespace {
-auto& current() {
-    static util::ThreadLocal<Scheduler> scheduler;
-    return scheduler;
-}
+
+thread_local Scheduler* localScheduler;
 } // namespace
 
 void Scheduler::SetCurrent(Scheduler* scheduler) {
-    current().set(scheduler);
+    localScheduler = scheduler;
 }
 
 Scheduler* Scheduler::GetCurrent() {
-    return current().get();
+    return localScheduler;
 }
 
 // static