diff --git a/server/src/main/java/org/elasticsearch/persistent/PersistentTasksCustomMetaData.java b/server/src/main/java/org/elasticsearch/persistent/PersistentTasksCustomMetaData.java
index a5048052a18..a0f6fa3d9f7 100644
--- a/server/src/main/java/org/elasticsearch/persistent/PersistentTasksCustomMetaData.java
+++ b/server/src/main/java/org/elasticsearch/persistent/PersistentTasksCustomMetaData.java
@@ -366,7 +366,7 @@ public final class PersistentTasksCustomMetaData extends AbstractNamedDiffable<M
          * to a new executor node and the status hasn't been updated then the task status is stale.
          */
         public boolean isCurrentStatus() {
-            return allocationIdOnLastStatusUpdate == allocationId;
+            return allocationIdOnLastStatusUpdate != null && allocationIdOnLastStatusUpdate == allocationId;
         }
 
         @Override