diff --git a/src/net/rpc.rs b/src/net/rpc.rs
index effad59e..ffec2fc9 100644
--- a/src/net/rpc.rs
+++ b/src/net/rpc.rs
@@ -102,6 +102,9 @@ impl Rpc {
 			match msg {
 				// We've received a message from the client
 				Ok(msg) => {
+					if msg.is_ping() {
+						let _ = chn.send(Message::pong(vec![]));
+					}
 					if msg.is_text() {
 						tokio::task::spawn(Rpc::call(rpc.clone(), msg, chn.clone()));
 					}