diff --git a/PlayWallPlugins/PlayWallPluginWebAPI/src/main/scala/de/tobias/playpad/plugin/api/websocket/methods/ProjectCurrentMethod.scala b/PlayWallPlugins/PlayWallPluginWebAPI/src/main/scala/de/tobias/playpad/plugin/api/websocket/methods/ProjectCurrentMethod.scala
index fd084b38d1914a9548752fe495f7f83eeca756c7..df30b50fc0631d8057067bd99e035aa9bb239896 100644
--- a/PlayWallPlugins/PlayWallPluginWebAPI/src/main/scala/de/tobias/playpad/plugin/api/websocket/methods/ProjectCurrentMethod.scala
+++ b/PlayWallPlugins/PlayWallPluginWebAPI/src/main/scala/de/tobias/playpad/plugin/api/websocket/methods/ProjectCurrentMethod.scala
@@ -11,6 +11,10 @@ class ProjectCurrentMethod extends MethodExecutable {
 	override def execute(session: Session, message: Message): JsonObject = {
 		val currentProject = PlayPadPlugin.getInstance().getCurrentProject
 
-		ProjectSerializer.serializeProject(currentProject)
+		if (currentProject == null) {
+			new JsonObject
+		} else {
+			ProjectSerializer.serializeProject(currentProject)
+		}
 	}
 }