diff --git a/src/database/entities/server.rs b/src/database/entities/server.rs
index 461891a7..13337efd 100644
--- a/src/database/entities/server.rs
+++ b/src/database/entities/server.rs
@@ -53,7 +53,7 @@ pub struct Server {
 }
 
 impl Server {
-    pub async fn publish(self) -> Result<()> {
+    pub async fn create(self) -> Result<()> {
         get_collection("servers")
             .insert_one(
                 to_document(&self).map_err(|_| Error::DatabaseError {
@@ -68,9 +68,6 @@ impl Server {
                 with: "server",
             })?;
 
-        let server_id = self.id.clone();
-        ClientboundNotification::ServerCreate(self).publish(server_id);
-
         Ok(())
     }
 
diff --git a/src/notifications/events.rs b/src/notifications/events.rs
index fbc67c9d..4a105dc8 100644
--- a/src/notifications/events.rs
+++ b/src/notifications/events.rs
@@ -1,6 +1,5 @@
-use futures::StreamExt;
 use hive_pubsub::PubSub;
-use mongodb::bson::{doc, Document};
+use mongodb::bson::doc;
 use rauth::auth::Session;
 use rocket_contrib::json::JsonValue;
 use serde::{Deserialize, Serialize};
@@ -8,7 +7,7 @@ use serde::{Deserialize, Serialize};
 use super::hive::{get_hive, subscribe_if_exists};
 use crate::{
     database::*,
-    util::result::{Error, Result},
+    util::result::{Result},
 };
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -105,7 +104,6 @@ pub enum ClientboundNotification {
         user: String,
     },
 
-    ServerCreate(Server),
     ServerUpdate {
         id: String,
         data: JsonValue,
@@ -196,9 +194,6 @@ pub async fn prehandle_hook(notification: &ClientboundNotification) -> Result<()
                 subscribe_if_exists(user.clone(), channel).ok();
             }
         }
-        ClientboundNotification::ServerCreate(server) => {
-            subscribe_if_exists(server.owner.clone(), server.id.clone()).ok();
-        }
         ClientboundNotification::UserRelationship { id, user, status } => {
             if status != &RelationshipStatus::None {
                 subscribe_if_exists(id.clone(), user.id.clone()).ok();
diff --git a/src/routes/servers/server_create.rs b/src/routes/servers/server_create.rs
index 963e8b00..28d27c47 100644
--- a/src/routes/servers/server_create.rs
+++ b/src/routes/servers/server_create.rs
@@ -68,7 +68,7 @@ pub async fn req(user: User, info: Json<Data>) -> Result<JsonValue> {
     .publish()
     .await?;
 
-    server.clone().publish().await?;
+    server.clone().create().await?;
     server.join_member(&user.id).await?;
 
     Ok(json!(server))