diff --git a/src/main/java/com/arangodb/entity/LogLevelEntity.java b/src/main/java/com/arangodb/entity/LogLevelEntity.java
index dea5d4475..adcc1b393 100644
--- a/src/main/java/com/arangodb/entity/LogLevelEntity.java
+++ b/src/main/java/com/arangodb/entity/LogLevelEntity.java
@@ -29,6 +29,7 @@ public enum LogLevel {
         FATAL, ERROR, WARNING, INFO, DEBUG, TRACE, DEFAULT
     }
 
+    private LogLevel all;
     private LogLevel agency;
     private LogLevel agencycomm;
     private LogLevel cluster;
@@ -52,6 +53,10 @@ public LogLevelEntity() {
         super();
     }
 
+    public void setAll(final LogLevel all) {
+        this.all = all;
+    }
+
     public LogLevel getAgency() {
         return agency;
     }
diff --git a/src/test/java/com/arangodb/ArangoDBTest.java b/src/test/java/com/arangodb/ArangoDBTest.java
index 355d68d89..8e65d1d63 100644
--- a/src/test/java/com/arangodb/ArangoDBTest.java
+++ b/src/test/java/com/arangodb/ArangoDBTest.java
@@ -669,6 +669,29 @@ public void setLogLevel() {
         }
     }
 
+    @Test
+    public void setAllLogLevel() {
+        assumeTrue(isAtLeastVersion(3, 9));
+        final LogLevelEntity entity = new LogLevelEntity();
+        try {
+            entity.setAll(LogLevelEntity.LogLevel.ERROR);
+            final LogLevelEntity logLevel = arangoDB.setLogLevel(entity);
+            assertThat(logLevel, is(notNullValue()));
+            assertThat(logLevel.getAgency(), is(LogLevelEntity.LogLevel.ERROR));
+            assertThat(logLevel.getAgency(), is(LogLevelEntity.LogLevel.ERROR));
+
+            LogLevelEntity retrievedLevels = arangoDB.getLogLevel();
+            assertThat(retrievedLevels.getAgency(), is(LogLevelEntity.LogLevel.ERROR));
+            assertThat(retrievedLevels.getAgency(), is(LogLevelEntity.LogLevel.ERROR));
+
+            assertThat(logLevel.getAgency(), is(LogLevelEntity.LogLevel.ERROR));
+            assertThat(logLevel.getQueries(), is(LogLevelEntity.LogLevel.ERROR));
+        } finally {
+            entity.setAll(LogLevelEntity.LogLevel.INFO);
+            arangoDB.setLogLevel(entity);
+        }
+    }
+
     @Test
     public void arangoDBException() {
         try {