diff --git a/src/OpenStreetMap-esp32.cpp b/src/OpenStreetMap-esp32.cpp
index 5c733e2..1b6e846 100644
--- a/src/OpenStreetMap-esp32.cpp
+++ b/src/OpenStreetMap-esp32.cpp
@@ -594,8 +594,9 @@ bool OpenStreetMap::startTileWorkerTasks()
     if (tasksStarted)
         return true;
 
-    const int numCores = ESP.getChipCores();
+    ownerTask = xTaskGetCurrentTaskHandle();
 
+    const int numCores = ESP.getChipCores();
     for (int core = 0; core < numCores; ++core)
     {
         char taskName[16];
diff --git a/src/OpenStreetMap-esp32.h b/src/OpenStreetMap-esp32.h
index 6ff0382..1bd6344 100644
--- a/src/OpenStreetMap-esp32.h
+++ b/src/OpenStreetMap-esp32.h
@@ -71,10 +71,7 @@ namespace
 class OpenStreetMap
 {
 public:
-    OpenStreetMap()
-    {
-        ownerTask = xTaskGetCurrentTaskHandle();
-    }
+    OpenStreetMap() = default;
     OpenStreetMap(const OpenStreetMap &) = delete;
     OpenStreetMap &operator=(const OpenStreetMap &) = delete;
     OpenStreetMap(OpenStreetMap &&other) = delete;