diff --git a/src/service/appservice/mod.rs b/src/service/appservice/mod.rs
index 4bda8961..7d2d46bd 100644
--- a/src/service/appservice/mod.rs
+++ b/src/service/appservice/mod.rs
@@ -143,7 +143,8 @@ impl Service {
             .registration_info
             .write()
             .await
-            .remove(service_name);
+            .remove(service_name)
+            .ok_or_else(|| crate::Error::AdminCommand("Appservice not found"))?;
 
         self.db.unregister_appservice(service_name)
     }
diff --git a/src/utils/error.rs b/src/utils/error.rs
index 04390283..899dfde6 100644
--- a/src/utils/error.rs
+++ b/src/utils/error.rs
@@ -85,6 +85,8 @@ pub enum Error {
     #[cfg(feature = "conduit_bin")]
     #[error("{0}")]
     PathError(#[from] axum::extract::rejection::PathRejection),
+    #[error("{0}")]
+    AdminCommand(&'static str),
 }
 
 impl Error {