diff --git a/jsonrpsee/src/lib.rs b/jsonrpsee/src/lib.rs
index be4199412d..74d136acf1 100644
--- a/jsonrpsee/src/lib.rs
+++ b/jsonrpsee/src/lib.rs
@@ -78,10 +78,13 @@ cfg_client_transport! {
 
 cfg_server! {
 	pub use jsonrpsee_server as server;
-	pub use jsonrpsee_core::server::*;
 	pub use tokio;
 }
 
+cfg_server_core! {
+	pub use jsonrpsee_core::server::*;
+}
+
 cfg_proc_macros! {
 	pub use jsonrpsee_proc_macros as proc_macros;
 	pub use tracing;
diff --git a/jsonrpsee/src/macros.rs b/jsonrpsee/src/macros.rs
index e246529a80..b8b325f5bc 100644
--- a/jsonrpsee/src/macros.rs
+++ b/jsonrpsee/src/macros.rs
@@ -56,6 +56,12 @@ macro_rules! cfg_server {
 	}
 }
 
+macro_rules! cfg_server_core {
+	($($item:item)*) => {
+		cfg_feature!("server-core", $($item)*);
+	}
+}
+
 macro_rules! cfg_proc_macros {
 	($($item:item)*) => {
 		cfg_feature!("jsonrpsee-proc-macros", $($item)*);