diff --git a/src/bundle/recordsManagement/Controller/archiveAccessTrait.php b/src/bundle/recordsManagement/Controller/archiveAccessTrait.php
index ebcea7ba00774b4c84a77ab431de1a2d57c6301c..db3c34cbe9526e0524db46d838584e190c1bd2eb 100755
--- a/src/bundle/recordsManagement/Controller/archiveAccessTrait.php
+++ b/src/bundle/recordsManagement/Controller/archiveAccessTrait.php
@@ -85,6 +85,10 @@ trait archiveAccessTrait
         $checkAccess = true,
         $maxResults = null
     ) {
+        if(is_null($originatorArchiveId)) {
+            $originatorArchiveId = $archiverArchiveId;
+        }
+        
         $accountController = \laabs::newController('auth/userAccount');
         $accountController->isAuthorized('user');
 
@@ -1035,6 +1039,11 @@ trait archiveAccessTrait
             $queryParts['archiverArchiveId'] = "archiverArchiveId= :archiverArchiveId";
             $queryParams['archiverArchiveId'] = $args['archiverArchiveId'];
         }
+        if (!empty($args['originatorArchiveId']) && !empty($args['archiverArchiveId']) && $args['originatorArchiveId'] == $args['archiverArchiveId']) {
+            $queryParts['originatorArchiveId'] = "(archiveId= :archiveId OR originatorArchiveId= :originatorArchiveId OR archiverArchiveId= :archiverArchiveId)";
+            $queryParams['archiveId'] = $args['originatorArchiveId'];
+            unset($queryParts['archiverArchiveId']);
+        }
         if (!empty($args['originatingDate'])) {
             if (!empty($args['originatingDate'][0]) && is_string($args['originatingDate'][0])) {
                 $args['originatingDate'][0] = \laabs::newDate($args['originatingDate'][0]);