diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/GraphsJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/GraphsJSONResolver.java
index 9f7428157..430b2b346 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/GraphsJSONResolver.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/GraphsJSONResolver.java
@@ -80,11 +80,9 @@ public class GraphsJSONResolver implements Resolver {
 
         DataID dataID = getDataID(type);
 
-        JSONStorage.StoredJSON graphJSON = getGraphJSON(request, dataID);
-
         return Response.builder()
                 .setMimeType(MimeType.JSON)
-                .setJSONContent(graphJSON.json)
+                .setJSONContent(getGraphJSON(request, dataID).json)
                 .build();
     }
 
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/UnitSemaphoreAccessLock.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/UnitSemaphoreAccessLock.java
index ac9cd0373..d2af083c9 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/UnitSemaphoreAccessLock.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/UnitSemaphoreAccessLock.java
@@ -36,7 +36,7 @@ public class UnitSemaphoreAccessLock {
     public void enter() {
         try {
             synchronized (lockObject) {
-                if (accessing.get()) {
+                while (accessing.get()) {
                     lockObject.wait();
                 }
                 accessing.set(true);