diff --git a/src/core/Elsa.Core/Persistence/Specifications/Bookmarks/BookmarkSpecification.cs b/src/core/Elsa.Core/Persistence/Specifications/Bookmarks/BookmarkSpecification.cs
index 46c30e523..6d7c704a1 100644
--- a/src/core/Elsa.Core/Persistence/Specifications/Bookmarks/BookmarkSpecification.cs
+++ b/src/core/Elsa.Core/Persistence/Specifications/Bookmarks/BookmarkSpecification.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq.Expressions;
 using Elsa.Models;
 
@@ -16,10 +16,13 @@ namespace Elsa.Persistence.Specifications.Bookmarks
         public string? TenantId { get; set; }
         public string? CorrelationId { get; }
         public string ActivityType { get; set; }
-        
-        public override Expression<Func<Bookmark, bool>> ToExpression() => bookmark => 
-            bookmark.TenantId == TenantId &&
-            bookmark.ActivityType == ActivityType &&
-            (CorrelationId == null || bookmark.CorrelationId == CorrelationId);
+
+        public override Expression<Func<Bookmark, bool>> ToExpression() =>
+            CorrelationId == null
+            ? bookmark => bookmark.TenantId == TenantId
+                && bookmark.ActivityType == ActivityType
+            : bookmark => bookmark.TenantId == TenantId
+                && bookmark.ActivityType == ActivityType
+                && bookmark.CorrelationId == CorrelationId;
     }
 }
\ No newline at end of file