diff --git a/common/ASC.Data.Storage/Encryption/EncryptionFactory.cs b/common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
index 2fa9864a3a..27eda583c4 100644
--- a/common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
+++ b/common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
@@ -28,18 +28,18 @@ namespace ASC.Data.Storage.Encryption
     [Singletone]
     public class EncryptionFactory
     {
-        private readonly IServiceProvider _serviceProvider;
+        private readonly IServiceScopeFactory _serviceScopeFactory;
 
-        public EncryptionFactory(IServiceProvider serviceProvider)
+        public EncryptionFactory(IServiceScopeFactory serviceScopeFactory)
         {
-            _serviceProvider = serviceProvider;
+            _serviceScopeFactory = serviceScopeFactory;
         }
 
         public ICrypt GetCrypt(string storageName, EncryptionSettings encryptionSettings)
         {
             ICrypt result = null;
 
-            using var scope = _serviceProvider.CreateScope();
+            using var scope = _serviceScopeFactory.CreateScope();
             if (scope != null)
             {
                 result = scope.ServiceProvider.GetService<ICrypt>();
diff --git a/common/ASC.Data.Storage/Encryption/EncryptionOperation.cs b/common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
index b99451360b..d3a064e02e 100644
--- a/common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
+++ b/common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
@@ -33,7 +33,7 @@ namespace ASC.Data.Storage.Encryption
         private const string ConfigPath = "";
         private const string ProgressFileName = "EncryptionProgress.tmp";
 
-        private readonly IServiceProvider _serviceProvider;
+        private readonly IServiceScopeFactory _serviceScopeFactory;
         private bool _hasErrors = false;
         private EncryptionSettings _encryptionSettings;
         private bool _isEncryption;
@@ -42,9 +42,9 @@ namespace ASC.Data.Storage.Encryption
         private IEnumerable<Tenant> _tenants;
         private string _serverRootPath;
 
-        public EncryptionOperation(IServiceProvider serviceProvider)
+        public EncryptionOperation(IServiceScopeFactory serviceScopeFactory)
         {
-            _serviceProvider = serviceProvider;
+            _serviceScopeFactory = serviceScopeFactory;
         }
 
         public void Init(EncryptionSettingsProto encryptionSettingsProto, string id)
@@ -57,7 +57,7 @@ namespace ASC.Data.Storage.Encryption
 
         protected override void DoJob()
         {
-            using var scope = _serviceProvider.CreateScope();
+            using var scope = _serviceScopeFactory.CreateScope();
             var scopeClass = scope.ServiceProvider.GetService<EncryptionOperationScope>();
             var (log, encryptionSettingsHelper, tenantManager, notifyHelper, coreBaseSettings, storageFactoryConfig, storageFactory, configuration) = scopeClass;
             notifyHelper.Init(_serverRootPath);
@@ -124,7 +124,6 @@ namespace ASC.Data.Storage.Encryption
             }
         }
 
-
         private void EncryptStore(Tenant tenant, string module, DiscDataStore store, StorageFactoryConfig storageFactoryConfig, ILog log)
         {
             var domains = storageFactoryConfig.GetDomainList(ConfigPath, module).ToList();