diff --git a/Cargo.toml b/Cargo.toml
index 78225af0..0daa2679 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -81,7 +81,6 @@ default-features = false
 version = "0.6.20"
 default-features = false
 features = ["form", "headers", "http1", "http2", "json", "matched-path"]
-optional = true
 
 [dependencies.axum-server]
 version = "0.5.1"
@@ -293,8 +292,7 @@ hyperlocal = { git = "https://github.com/softprops/hyperlocal", rev = "2ee4d1496
 
 
 [features]
-default = ["conduit_bin", "backend_rocksdb", "systemd", "element_hacks", "sentry_telemetry", "gzip_compression", "brotli_compression"]
-conduit_bin = ["axum"]
+default = ["backend_rocksdb", "systemd", "element_hacks", "sentry_telemetry", "gzip_compression", "brotli_compression"]
 backend_sqlite = ["sqlite"]
 backend_rocksdb = ["rocksdb"]
 rocksdb = ["rust-rocksdb", "num_cpus"]
@@ -328,7 +326,6 @@ element_hacks = []
 [[bin]]
 name = "conduit"
 path = "src/main.rs"
-required-features = ["conduit_bin"]
 
 [lib]
 name = "conduit"
diff --git a/src/api/ruma_wrapper/mod.rs b/src/api/ruma_wrapper/mod.rs
index 94c7dd8e..2b0cd06b 100644
--- a/src/api/ruma_wrapper/mod.rs
+++ b/src/api/ruma_wrapper/mod.rs
@@ -4,7 +4,6 @@ use ruma::{api::client::uiaa::UiaaResponse, CanonicalJsonValue, OwnedDeviceId, O
 
 use crate::Error;
 
-#[cfg(feature = "conduit_bin")]
 mod axum;
 
 /// Extractor for Ruma request structs
diff --git a/src/utils/error.rs b/src/utils/error.rs
index fd14caeb..85fc1e7b 100644
--- a/src/utils/error.rs
+++ b/src/utils/error.rs
@@ -68,10 +68,8 @@ pub enum Error {
 	BadRequest(ErrorKind, &'static str),
 	#[error("{0}")]
 	Conflict(&'static str), // This is only needed for when a room alias already exists
-	#[cfg(feature = "conduit_bin")]
 	#[error("{0}")]
 	ExtensionError(#[from] axum::extract::rejection::ExtensionRejection),
-	#[cfg(feature = "conduit_bin")]
 	#[error("{0}")]
 	PathError(#[from] axum::extract::rejection::PathRejection),
 	#[error("from {0}: {1}")]
@@ -192,7 +190,6 @@ impl From<Infallible> for Error {
 	fn from(i: Infallible) -> Self { match i {} }
 }
 
-#[cfg(feature = "conduit_bin")]
 impl axum::response::IntoResponse for Error {
 	fn into_response(self) -> axum::response::Response { self.to_response().into_response() }
 }