diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/storage.py b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/storage.py
index d515381e39ec88510a32e8d5675a30e7f7d5c02f..b82a91c2f4d35ef0c0f37c0782513f605d22e9ae 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/storage.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/storage.py
@@ -38,12 +38,15 @@ def updateTaskStorageDetails(task, sqrpc):
 
     tasklist = task if isinstance(task, list) else [task]
 
-    if len(tasklist) == 0:
-        return
-
     for t in tasklist:
         applyDefaults(t)
 
+    statuses = set(['finished', 'completing', 'aborted'])
+    tasklist = [t for t in tasklist if t['cluster'] == 'CEP4' and t['status'] in statuses]
+
+    if len(tasklist) == 0:
+        return
+
     if not sqrpc:
         return