diff --git a/sdk/storage/Azure.Storage.Blobs/src/Azure.Storage.Blobs.csproj b/sdk/storage/Azure.Storage.Blobs/src/Azure.Storage.Blobs.csproj
index e512ca8c25e8b..b3ac3a36dac01 100644
--- a/sdk/storage/Azure.Storage.Blobs/src/Azure.Storage.Blobs.csproj
+++ b/sdk/storage/Azure.Storage.Blobs/src/Azure.Storage.Blobs.csproj
@@ -25,6 +25,7 @@
+
diff --git a/sdk/storage/Azure.Storage.Blobs/src/BlobExtensions.cs b/sdk/storage/Azure.Storage.Blobs/src/BlobExtensions.cs
index 78c83f08647c1..f5849ee4255c5 100644
--- a/sdk/storage/Azure.Storage.Blobs/src/BlobExtensions.cs
+++ b/sdk/storage/Azure.Storage.Blobs/src/BlobExtensions.cs
@@ -1377,6 +1377,13 @@ internal static BlobLegalHoldResult ToBlobLegalHoldInfo(this ResponseWithHeaders
#region ValidateConditionsNotPresent
internal static void ValidateConditionsNotPresent(this BlobRequestConditions requestConditions, BlobRequestConditionProperty invalidConditions)
{
+ if (AppContextSwitchHelper.GetConfigValue(
+ Constants.DisableRequestConditionsValidationSwitchName,
+ Constants.DisableRequestConditionsValidationEnvVar))
+ {
+ return;
+ }
+
if (requestConditions == null)
{
return;
diff --git a/sdk/storage/Azure.Storage.Common/src/Shared/Constants.cs b/sdk/storage/Azure.Storage.Common/src/Shared/Constants.cs
index b7bef9738e6fe..a07f2760fb7c8 100644
--- a/sdk/storage/Azure.Storage.Common/src/Shared/Constants.cs
+++ b/sdk/storage/Azure.Storage.Common/src/Shared/Constants.cs
@@ -104,6 +104,9 @@ internal static class Constants
public const string Iso8601Format = "yyyy'-'MM'-'dd'T'HH':'mm':'ssZ";
+ public const string DisableRequestConditionsValidationSwitchName = "Azure.Storage.DisableRequestConditionsValidation";
+ public const string DisableRequestConditionsValidationEnvVar = "AZURE_STORAGE_DISABLE_REQUEST_CONDITIONS_VALIDATION";
+
///
/// Storage Connection String constant values.
///