diff --git a/modules/client/sync/device_lists.cc b/modules/client/sync/device_lists.cc
index d3c86931e..89ded343b 100644
--- a/modules/client/sync/device_lists.cc
+++ b/modules/client/sync/device_lists.cc
@@ -41,6 +41,12 @@ ircd::m::sync::device_lists_linear(data &data)
 	if(!startswith(json::get<"type"_>(event), "ircd.device"))
 		return false;
 
+	if(startswith(json::get<"type"_>(event), "ircd.device.signing"))
+		return false;
+
+	if(startswith(json::get<"type"_>(event), "ircd.device.one_time_key"))
+		return false;
+
 	const m::user sender
 	{
 		m::user::id(json::get<"sender"_>(event))
@@ -56,7 +62,9 @@ ircd::m::sync::device_lists_linear(data &data)
 
 	const bool changed
 	{
-		mitsein.has(data.user, "join")
+		false
+		|| sender == data.user.user_id
+		|| mitsein.has(data.user, "join")
 	};
 
 	const bool left
@@ -67,6 +75,11 @@ ircd::m::sync::device_lists_linear(data &data)
 	if(!changed && !left)
 		return false;
 
+	json::stack::object device_lists
+	{
+		*data.out, "device_lists"
+	};
+
 	json::stack::array array
 	{
 		*data.out, left? "left": "changed"