diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
index 83feb71e677ee7c2fa694ea7b276fef987562ce9..b1bf277f74cf04653c1fdddf056a72072fe4fa08 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
@@ -191,12 +191,6 @@ class RADatabase:
             query += ' WHERE ' + ' AND '.join(conditions)
 
         tasks = list(self._executeQuery(query, qargs, fetch=_FETCH_ALL))
-        predIds = self.getTaskPredecessorIds()
-        succIds = self.getTaskSuccessorIds()
-
-        for task in tasks:
-            task['predecessor_ids'] = predIds.get(task['id'], [])
-            task['successor_ids'] = succIds.get(task['id'], [])
 
         return tasks
 
@@ -220,6 +214,13 @@ class RADatabase:
 
         task = dict(result) if result else None
 
+        if task:
+            if task['predecessor_ids'] is None:
+                task['predecessor_ids'] = []
+
+            if task['successor_ids'] is None:
+                task['successor_ids'] = []
+
         return task
 
     def _convertTaskTypeAndStatusToIds(self, task_status, task_type):