diff --git a/fairmq/sdk/Topology.cxx b/fairmq/sdk/Topology.cxx
index 8561a79f..86f85466 100644
--- a/fairmq/sdk/Topology.cxx
+++ b/fairmq/sdk/Topology.cxx
@@ -234,7 +234,7 @@ void Topology::WaitForState()
     LOG(debug) << "WaitForState shutting down";
 };
 
-void Topology::AddNewStateEntry(uint64_t senderId, const std::string& state)
+void Topology::AddNewStateEntry(DDSTask::Id senderId, const std::string& state)
 {
     std::size_t pos = state.find("->");
     std::string endState = state.substr(pos + 2);
diff --git a/fairmq/sdk/Topology.h b/fairmq/sdk/Topology.h
index 6b3bf54b..f455a6a7 100644
--- a/fairmq/sdk/Topology.h
+++ b/fairmq/sdk/Topology.h
@@ -139,7 +139,6 @@ class Topology
     DDSSession fDDSSession;
     DDSTopology fDDSTopo;
     TopologyState fState;
-    std::unordered_map<uint64_t, DeviceStatus> fStateChangesSubscriptions;
     bool fStateChangeOngoing;
     DeviceState fTargetState;
     mutable std::mutex fMtx;
@@ -153,7 +152,7 @@ class Topology
     std::string fStateChangeError;
 
     void WaitForState();
-    void AddNewStateEntry(uint64_t senderId, const std::string& state);
+    void AddNewStateEntry(DDSTask::Id senderId, const std::string& state);
 };
 
 using Topo = Topology;