diff --git a/src/api/router/auth.rs b/src/api/router/auth.rs
index 72fb12017..2b52e93ee 100644
--- a/src/api/router/auth.rs
+++ b/src/api/router/auth.rs
@@ -60,8 +60,9 @@ impl ClientIdentity {
 
 	pub(crate) fn expect_sender_device(&self) -> Result<&DeviceId> {
 		match self {
-			| Self::User { sender_device, .. } => Ok(sender_device),
-			| Self::Appservice { .. } =>
+			| Self::User { sender_device, .. }
+			| Self::Appservice { sender_device: Some(sender_device), .. } => Ok(sender_device),
+			| Self::Appservice { sender_device: None, .. } =>
 				Err!(Request(Forbidden("Appservices must masquerade to use this endpoint."))),
 		}
 	}