diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java
index 409e714a0..f849eb541 100644
--- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java
+++ b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java
@@ -88,10 +88,7 @@ public class SystemSecurityContext {
      *         code block.
      */
     public boolean isCurrentThreadSystemCode() {
-        if (SecurityContextHolder.getContext().getAuthentication() instanceof SystemCodeAuthentication) {
-            return true;
-        }
-        return false;
+        return SecurityContextHolder.getContext().getAuthentication() instanceof SystemCodeAuthentication;
     }
 
     private static void setSystemContext() {