diff --git a/src/OpenStreetMap-esp32.cpp b/src/OpenStreetMap-esp32.cpp
index 8fb1de9..6149d13 100644
--- a/src/OpenStreetMap-esp32.cpp
+++ b/src/OpenStreetMap-esp32.cpp
@@ -456,9 +456,6 @@ std::optional<std::unique_ptr<MemoryBuffer>> OpenStreetMap::urlToBuffer(const ch
     return buffer;
 }
 
-thread_local OpenStreetMap *OpenStreetMap::currentInstance = nullptr;
-thread_local uint16_t *OpenStreetMap::currentTileBuffer = nullptr;
-
 void OpenStreetMap::PNGDraw(PNGDRAW *pDraw)
 {
     if (!currentInstance || !currentInstance->currentTileBuffer)
diff --git a/src/OpenStreetMap-esp32.hpp b/src/OpenStreetMap-esp32.hpp
index 4b41967..ccfb523 100644
--- a/src/OpenStreetMap-esp32.hpp
+++ b/src/OpenStreetMap-esp32.hpp
@@ -87,8 +87,8 @@ class OpenStreetMap
 private:
     SemaphoreHandle_t cacheMutex = nullptr;
     std::vector<CachedTile> tilesCache;
-    thread_local static uint16_t *currentTileBuffer;
-    thread_local static OpenStreetMap *currentInstance;
+    static inline thread_local OpenStreetMap *currentInstance = nullptr;
+    static inline thread_local uint16_t *currentTileBuffer = nullptr;
     static void PNGDraw(PNGDRAW *pDraw);
     double lon2tile(double lon, uint8_t zoom);
     double lat2tile(double lat, uint8_t zoom);