diff --git a/DLCM-ResourceServerCommon/src/main/java/ch/dlcm/service/rest/abstractservice/ArchivalInfoPackageRemoteResourceService.java b/DLCM-ResourceServerCommon/src/main/java/ch/dlcm/service/rest/abstractservice/ArchivalInfoPackageRemoteResourceService.java
index aa67c54c8144655325f8b7d69ced5da2e95fdad9..80516434f5de0733cff31272c165645d70d9414d 100644
--- a/DLCM-ResourceServerCommon/src/main/java/ch/dlcm/service/rest/abstractservice/ArchivalInfoPackageRemoteResourceService.java
+++ b/DLCM-ResourceServerCommon/src/main/java/ch/dlcm/service/rest/abstractservice/ArchivalInfoPackageRemoteResourceService.java
@@ -277,6 +277,9 @@ public abstract class ArchivalInfoPackageRemoteResourceService extends RemoteRes
   }
 
   public String[] getArchivalStorageListByPreference(Integer preferredStorageIndex) {
+    if (preferredStorageIndex == null) {
+      return this.archivalStorageList;
+    }
     List<String> list = new ArrayList<>(Arrays.asList(this.archivalStorageList));
     String preferredStorage = list.remove(preferredStorageIndex.intValue());
     list.add(0, preferredStorage);