diff --git a/common/ASC.Api.Core/Extensions/ISetupBuilderExtension.cs b/common/ASC.Api.Core/Extensions/ISetupBuilderExtension.cs
index 161859791f..d3e99c6fca 100644
--- a/common/ASC.Api.Core/Extensions/ISetupBuilderExtension.cs
+++ b/common/ASC.Api.Core/Extensions/ISetupBuilderExtension.cs
@@ -64,6 +64,10 @@ public static class ISetupBuilderExtension
             if (!string.IsNullOrEmpty(awsAccessKeyId))
             {
                 awsTarget.Credentials = new Amazon.Runtime.BasicAWSCredentials(awsAccessKeyId, awsSecretAccessKey);
+            }
+            else
+            {
+                conf.RemoveTarget(targetName);
             }
         }