diff --git a/core/src/main/java/org/fao/geonet/api/records/attachments/AbstractStore.java b/core/src/main/java/org/fao/geonet/api/records/attachments/AbstractStore.java
index dfcd55a1b51..c2c20f8c898 100644
--- a/core/src/main/java/org/fao/geonet/api/records/attachments/AbstractStore.java
+++ b/core/src/main/java/org/fao/geonet/api/records/attachments/AbstractStore.java
@@ -97,7 +97,7 @@ public final ResourceHolder getResource(ServiceContext context, String metadataU
     }
 
     protected static AccessManager getAccessManager(final ServiceContext context) {
-        return context.getBean(AccessManager.class);
+        return ApplicationContextHolder.get().getBean(AccessManager.class);
     }
 
     public static int getAndCheckMetadataId(String metadataUuid, Boolean approved) throws Exception {
diff --git a/datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java b/datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java
index 87f74ab9982..769267a5a14 100644
--- a/datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java
+++ b/datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java
@@ -617,7 +617,7 @@ protected Path getBaseMetadataDir(ServiceContext context, Path metadataFullDir)
     }
 
     private GeonetworkDataDirectory getDataDirectory(ServiceContext context) {
-        return context.getBean(GeonetworkDataDirectory.class);
+        return ApplicationContextHolder.get().getBean(GeonetworkDataDirectory.class);
     }
 
     /**
@@ -690,7 +690,7 @@ protected MetadataResourceExternalManagementProperties getMetadataResourceExtern
 
             if (metadataResourceExternalManagementPropertiesUrl.contains("{lang}") || metadataResourceExternalManagementPropertiesUrl.contains("{ISO3lang}")) {
                 final IsoLanguagesMapper mapper = ApplicationContextHolder.get().getBean(IsoLanguagesMapper.class);
-                String contextLang = context.getLanguage() == null ? Geonet.DEFAULT_LANGUAGE : context.getLanguage();
+                String contextLang = context==null || context.getLanguage() == null ? Geonet.DEFAULT_LANGUAGE : context.getLanguage();
                 String lang;
                 String iso3Lang;
 
diff --git a/datastorages/jcloud/src/main/java/org/fao/geonet/api/records/attachments/JCloudStore.java b/datastorages/jcloud/src/main/java/org/fao/geonet/api/records/attachments/JCloudStore.java
index d7ed09b1837..02bccbedc49 100644
--- a/datastorages/jcloud/src/main/java/org/fao/geonet/api/records/attachments/JCloudStore.java
+++ b/datastorages/jcloud/src/main/java/org/fao/geonet/api/records/attachments/JCloudStore.java
@@ -381,7 +381,7 @@ private Path getBaseMetadataDir(ServiceContext context, Path metadataFullDir) {
     }
 
     private GeonetworkDataDirectory getDataDirectory(ServiceContext context) {
-        return context.getBean(GeonetworkDataDirectory.class);
+        return ApplicationContextHolder.get().getBean(GeonetworkDataDirectory.class);
     }
 
     /**