diff --git a/worterbuch-client/src/lib.rs b/worterbuch-client/src/lib.rs
index 6cf807a..4735870 100644
--- a/worterbuch-client/src/lib.rs
+++ b/worterbuch-client/src/lib.rs
@@ -1414,7 +1414,7 @@ async fn process_incoming_server_message(
                 SM::PState(pstate) => deliver_pstate(pstate, callbacks).await?,
                 SM::LsState(ls) => deliver_ls(ls, callbacks).await?,
                 SM::Err(err) => deliver_err(err, callbacks).await,
-                SM::Ack(_) | SM::Welcome(_) | SM::Authorized(_) | SM::Keepalive => (),
+                SM::Ack(_) | SM::Welcome(_) | SM::Authorized(_) => (),
             }
             Ok(ControlFlow::Continue(()))
         }
diff --git a/worterbuch-common/src/client.rs b/worterbuch-common/src/client.rs
index 8078a91..c366607 100644
--- a/worterbuch-common/src/client.rs
+++ b/worterbuch-common/src/client.rs
@@ -40,8 +40,6 @@ pub enum ClientMessage {
     SubscribeLs(SubscribeLs),
     UnsubscribeLs(UnsubscribeLs),
     Transform(Transform),
-    #[serde(rename = "")]
-    Keepalive,
 }
 
 impl ClientMessage {
@@ -64,7 +62,6 @@ impl ClientMessage {
             ClientMessage::SubscribeLs(m) => Some(m.transaction_id),
             ClientMessage::UnsubscribeLs(m) => Some(m.transaction_id),
             ClientMessage::Transform(m) => Some(m.transaction_id),
-            ClientMessage::Keepalive => None,
         }
     }
 }
diff --git a/worterbuch-common/src/lib.rs b/worterbuch-common/src/lib.rs
index 099603c..5458068 100644
--- a/worterbuch-common/src/lib.rs
+++ b/worterbuch-common/src/lib.rs
@@ -310,7 +310,7 @@ pub fn digest_token(auth_token: &Option<String>, client_id: String) -> Option<St
 
 #[cfg(test)]
 mod test {
-    use crate::{ClientMessage, ErrorCode, ServerMessage};
+    use crate::ErrorCode;
     use std::cmp::Ordering;
 
     #[test]
@@ -351,38 +351,6 @@ mod test {
         );
     }
 
-    #[test]
-    fn server_keepalive_can_be_serialized() {
-        assert_eq!(
-            r#""""#,
-            serde_json::to_string(&ServerMessage::Keepalive).unwrap()
-        );
-    }
-
-    #[test]
-    fn server_keepalive_can_be_deserialized() {
-        assert_eq!(
-            ServerMessage::Keepalive,
-            serde_json::from_str(r#""""#).unwrap()
-        );
-    }
-
-    #[test]
-    fn client_keepalive_can_be_serialized() {
-        assert_eq!(
-            r#""""#,
-            serde_json::to_string(&ClientMessage::Keepalive).unwrap()
-        );
-    }
-
-    #[test]
-    fn client_keepalive_can_be_deserialized() {
-        assert_eq!(
-            ClientMessage::Keepalive,
-            serde_json::from_str(r#""""#).unwrap()
-        );
-    }
-
     #[test]
     fn error_codes_are_serialized_as_numbers() {
         assert_eq!(
diff --git a/worterbuch-common/src/server.rs b/worterbuch-common/src/server.rs
index bad84f7..83c7446 100644
--- a/worterbuch-common/src/server.rs
+++ b/worterbuch-common/src/server.rs
@@ -34,8 +34,6 @@ pub enum ServerMessage {
     Err(Err),
     Authorized(Ack),
     LsState(LsState),
-    #[serde(rename = "")]
-    Keepalive,
 }
 
 impl ServerMessage {
@@ -48,7 +46,6 @@ impl ServerMessage {
             ServerMessage::Err(msg) => Some(msg.transaction_id),
             ServerMessage::LsState(msg) => Some(msg.transaction_id),
             ServerMessage::Authorized(_) => Some(0),
-            ServerMessage::Keepalive => None,
         }
     }
 }
diff --git a/worterbuch/src/server/common.rs b/worterbuch/src/server/common.rs
index a9c7173..49106c8 100644
--- a/worterbuch/src/server/common.rs
+++ b/worterbuch/src/server/common.rs
@@ -329,7 +329,6 @@ pub async fn process_incoming_message(
                 // TODO
                 return Ok((false, authorized));
             }
-            CM::Keepalive => (),
         },
         Ok(None) => {
             // client disconnected