diff --git a/packages/server/src/api.js b/packages/server/src/api.js
index 29737cc7..9e75a55f 100755
--- a/packages/server/src/api.js
+++ b/packages/server/src/api.js
@@ -216,6 +216,10 @@ export default class API {
             })
         }
 
+        this.server.websocket_instance.eventsChannels.push(["/main", "ping", async (socket) => {
+            return socket.emit("pong")
+        }])
+
         this.server.websocket_instance.eventsChannels.push(["/main", "authenticate", async (socket, authPayload) => {
             if (!authPayload) {
                 return onAuthenticatedFailed(socket, "missing_auth_payload")
diff --git a/packages/server/src/controllers/PublicController/endpoints/ping.js b/packages/server/src/controllers/PublicController/endpoints/ping.js
new file mode 100644
index 00000000..324631bf
--- /dev/null
+++ b/packages/server/src/controllers/PublicController/endpoints/ping.js
@@ -0,0 +1,7 @@
+export default {
+    route: "/ping",
+    method: "GET",
+    fn: async (req, res) => {
+        return res.send("pong")
+    }
+}
\ No newline at end of file