diff --git a/src/service/admin/query/appservice.rs b/src/service/admin/query/appservice.rs
index bfb63c95..8b97eec0 100644
--- a/src/service/admin/query/appservice.rs
+++ b/src/service/admin/query/appservice.rs
@@ -13,7 +13,20 @@ pub(super) async fn appservice(subcommand: Appservice) -> Result<RoomMessageEven
 			let results = services()
 				.appservice
 				.db
-				.get_registration(appservice_id.as_ref())?;
+				.get_registration(appservice_id.as_ref());
+			let query_time = timer.elapsed();
+
+			Ok(RoomMessageEventContent::text_html(
+				format!("Query completed in {query_time:?}:\n\n```\n{:?}```", results),
+				format!(
+					"<p>Query completed in {query_time:?}:</p>\n<pre><code>{:?}\n</code></pre>",
+					results
+				),
+			))
+		},
+		Appservice::All => {
+			let timer = tokio::time::Instant::now();
+			let results = services().appservice.db.all();
 			let query_time = timer.elapsed();
 
 			Ok(RoomMessageEventContent::text_html(
diff --git a/src/service/admin/query/mod.rs b/src/service/admin/query/mod.rs
index f3b4515d..bebbb771 100644
--- a/src/service/admin/query/mod.rs
+++ b/src/service/admin/query/mod.rs
@@ -85,6 +85,9 @@ pub(crate) enum Appservice {
 		/// Appservice registration ID
 		appservice_id: Box<str>,
 	},
+
+	/// - Gets all appservice registrations with their ID and registration info
+	All,
 }
 
 #[cfg_attr(test, derive(Debug))]