diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
index 8af4c3bc1..91b1a1209 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
@@ -1172,7 +1172,7 @@ public class TaskServiceImpl implements TaskService {
                 actualPrioDuration = handleNonNullAttachment(actualPrioDuration, attachment);
             }
         }
-        if (actualPrioDuration.getDuration() != null && MAX_DURATION.equals(actualPrioDuration.getDuration())) {
+        if (MAX_DURATION.equals(actualPrioDuration.getDuration())) {
             actualPrioDuration.setDuration(null);
         }