diff --git a/app/actors/ClientManager.java b/app/actors/ClientManager.java
index 21439b2..c8f722f 100644
--- a/app/actors/ClientManager.java
+++ b/app/actors/ClientManager.java
@@ -111,7 +111,7 @@ public void onReceive(Object message) throws Throwable {
             DiffUpdate diffUpdate = new DiffUpdate(lotName, newOccupancy);
             tellAllClients(diffUpdate);
         } else if (message instanceof CurrentStateRequest) {
-            getSender().tell(Json.toJson(allParkingLotState), getSelf());
+            getSender().tell(new HashMap<>(allParkingLotState), getSelf());
         } else if (message instanceof KeepAliveMessage) {
             tellAllClients(message);
         } else {
diff --git a/app/controllers/ParkingController.java b/app/controllers/ParkingController.java
index eb0a5bd..632b82c 100644
--- a/app/controllers/ParkingController.java
+++ b/app/controllers/ParkingController.java
@@ -133,7 +133,7 @@ public CompletionStage<Result> status() {
         //taken straight from documentation
         //https://www.playframework.com/documentation/2.5.x/JavaAkka#Creating-and-using-actors
         return FutureConverters.toJava(ask(clientManager, new CurrentStateRequest(), 1000)
-        ).thenApply(response -> ok((JsonNode) response));
+        ).thenApply(response -> ok(Json.toJson(response)));
     }