diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
index 38ea0d5448bd5b1ae3e98dd950de5d9bc0716d4d..cb503f2ecfca902190eb25a395406c0c2a52fa2f 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
@@ -88,7 +88,11 @@ import scala.collection.{Map, mutable}
 					case json: JsonObject =>
 						val session = account.Session.getSession(key, sessionDao)
 						session match {
-							case Some(s) => listeners(json.get("cmd").getAsString).onChange(json, connection, s)
+							case Some(s) =>
+								val cmd = json.get("cmd").getAsString
+								if (listeners.contains(cmd)) {
+									listeners(cmd).onChange(json, connection, s)
+								}
 							case None => serverSession.close(500, "Invalid Session")
 						}
 					case _ => serverSession.close(500, "Invalid Data")