diff --git a/matrix/user_devices.cc b/matrix/user_devices.cc
index 8117a6351..ab3684064 100644
--- a/matrix/user_devices.cc
+++ b/matrix/user_devices.cc
@@ -353,6 +353,9 @@ const
 		user_room
 	};
 
+	if(!state.has("ircd.device.device_id", device_id))
+		return true;
+
 	const room::state::type_prefix type
 	{
 		"ircd.device."