diff --git a/lib/icinga/downtime.cpp b/lib/icinga/downtime.cpp
index 2178953f3..3ec7e01d4 100644
--- a/lib/icinga/downtime.cpp
+++ b/lib/icinga/downtime.cpp
@@ -16,7 +16,7 @@ using namespace icinga;
 
 static int l_NextDowntimeID = 1;
 static std::mutex l_DowntimeMutex;
-static std::map<int, String> l_LegacyDowntimesCache;
+static std::map<int, Downtime::Ptr> l_LegacyDowntimesCache;
 static Timer::Ptr l_DowntimesOrphanedTimer;
 static Timer::Ptr l_DowntimesStartTimer;
 
@@ -109,7 +109,7 @@ void Downtime::Start(bool runtimeCreated)
 		std::unique_lock<std::mutex> lock(l_DowntimeMutex);
 
 		SetLegacyId(l_NextDowntimeID);
-		l_LegacyDowntimesCache[l_NextDowntimeID] = GetName();
+		l_LegacyDowntimesCache[l_NextDowntimeID] = this;
 		l_NextDowntimeID++;
 	}
 
@@ -522,7 +522,7 @@ String Downtime::GetDowntimeIDFromLegacyID(int id)
 	if (it == l_LegacyDowntimesCache.end())
 		return Empty;
 
-	return it->second;
+	return it->second->GetName();
 }
 
 void Downtime::DowntimesStartTimerHandler()