diff --git a/src/OpenStreetMap-esp32.hpp b/src/OpenStreetMap-esp32.hpp
index b50d379..ad1c2cd 100644
--- a/src/OpenStreetMap-esp32.hpp
+++ b/src/OpenStreetMap-esp32.hpp
@@ -116,7 +116,7 @@ class OpenStreetMap
     static void tileFetcherTask(void *param);
     static void PNGDraw(PNGDRAW *pDraw);
 
-    static inline OpenStreetMap *currentInstance = nullptr;
+    static inline thread_local OpenStreetMap *currentInstance = nullptr;
     static inline thread_local uint16_t *currentTileBuffer = nullptr;
     const TileProvider *currentProvider = &tileProviders[0];
     std::vector<CachedTile> tilesCache;