diff --git a/src/api/client/context.rs b/src/api/client/context.rs
index f07c41d1..a18b6352 100644
--- a/src/api/client/context.rs
+++ b/src/api/client/context.rs
@@ -132,7 +132,7 @@ pub(crate) async fn get_context_route(
 	let state_at = events_after
 		.last()
 		.map(ref_at!(1))
-		.map_or(body.event_id.as_ref(), |pdu| pdu.event_id.as_ref());
+		.map_or_else(|| body.event_id.as_ref(), |pdu| pdu.event_id.as_ref());
 
 	let state_ids = services
 		.rooms
diff --git a/src/service/globals/mod.rs b/src/service/globals/mod.rs
index d9dae562..7d934056 100644
--- a/src/service/globals/mod.rs
+++ b/src/service/globals/mod.rs
@@ -34,31 +34,33 @@ impl crate::Service for Service {
 		let db = Data::new(&args);
 		let config = &args.server.config;
 
-		let turn_secret =
-			config
-				.turn_secret_file
-				.as_ref()
-				.map_or(config.turn_secret.clone(), |path| {
-					std::fs::read_to_string(path).unwrap_or_else(|e| {
-						error!("Failed to read the TURN secret file: {e}");
-
-						config.turn_secret.clone()
-					})
-				});
-
-		let registration_token = config.registration_token_file.as_ref().map_or(
-			config.registration_token.clone(),
+		let turn_secret = config.turn_secret_file.as_ref().map_or_else(
+			|| config.turn_secret.clone(),
 			|path| {
-				let Ok(token) = std::fs::read_to_string(path).inspect_err(|e| {
-					error!("Failed to read the registration token file: {e}");
-				}) else {
-					return config.registration_token.clone();
-				};
+				std::fs::read_to_string(path).unwrap_or_else(|e| {
+					error!("Failed to read the TURN secret file: {e}");
 
-				Some(token)
+					config.turn_secret.clone()
+				})
 			},
 		);
 
+		let registration_token = config
+			.registration_token_file
+			.as_ref()
+			.map_or_else(
+				|| config.registration_token.clone(),
+				|path| {
+					let Ok(token) = std::fs::read_to_string(path).inspect_err(|e| {
+						error!("Failed to read the registration token file: {e}");
+					}) else {
+						return config.registration_token.clone();
+					};
+
+					Some(token)
+				},
+			);
+
 		Ok(Arc::new(Self {
 			db,
 			server: args.server.clone(),