diff --git a/src/service/oauth/grant.rs b/src/service/oauth/grant.rs
index e0ee34eb6..1e346ee13 100644
--- a/src/service/oauth/grant.rs
+++ b/src/service/oauth/grant.rs
@@ -145,12 +145,8 @@ pub fn to_scopes(&self) -> Result<HashSet<RequestedScope>, String> {
 				} else if let Some(captures) = device_token_regex.captures(token) {
 					scopes
 						.insert(RequestedScope::Device(captures.get(2).unwrap().as_str().into()))
-				} else if token == "openid" {
-					// TODO(unspecced): Element sets this scope but doesn't use
-					// it for anything
-					true
 				} else {
-					return Err(format!("Invalid scope: {token}"));
+					continue;
 				}
 			};