diff --git a/modules/federation/state.cc b/modules/federation/state.cc
index f6168b7ea..b94cf3caa 100644
--- a/modules/federation/state.cc
+++ b/modules/federation/state.cc
@@ -35,10 +35,9 @@ get__state(client &client,
 		url::decode(request.parv[0], room_id)
 	};
 
-	//TODO: =
 	m::event::id::buf event_id;
 	if(request.query["event_id"])
-		url::decode(request.query.at("event_id"), event_id);
+		event_id = url::decode(request.query.at("event_id"), event_id);
 
 	const m::room room
 	{
diff --git a/modules/federation/state_ids.cc b/modules/federation/state_ids.cc
index 518178b08..d5cd56efc 100644
--- a/modules/federation/state_ids.cc
+++ b/modules/federation/state_ids.cc
@@ -35,10 +35,9 @@ get__state_ids(client &client,
 		url::decode(request.parv[0], room_id)
 	};
 
-	//TODO: =
 	m::event::id::buf event_id;
-//	if(request.query["event_id"])
-//		event_id = url::decode(request.query.at("event_id"), event_id);
+	if(request.query["event_id"])
+		event_id = url::decode(request.query.at("event_id"), event_id);
 
 	const m::room room
 	{