diff --git a/sdk/storage/azure-storage-blobs/src/rest_client.cpp b/sdk/storage/azure-storage-blobs/src/rest_client.cpp
index 27a65870b9..ab0a62b478 100644
--- a/sdk/storage/azure-storage-blobs/src/rest_client.cpp
+++ b/sdk/storage/azure-storage-blobs/src/rest_client.cpp
@@ -3814,7 +3814,10 @@ namespace Azure { namespace Storage { namespace Blobs {
         response.Details.SequenceNumber
             = std::stoll(pRawResponse->GetHeaders().at("x-ms-blob-sequence-number"));
       }
-      response.BlobType = Models::BlobType(pRawResponse->GetHeaders().at("x-ms-blob-type"));
+      if (pRawResponse->GetHeaders().count("x-ms-blob-type") != 0)
+      {
+        response.BlobType = Models::BlobType(pRawResponse->GetHeaders().at("x-ms-blob-type"));
+      }
       if (pRawResponse->GetHeaders().count("x-ms-copy-completion-time") != 0)
       {
         response.Details.CopyCompletedOn = DateTime::Parse(
@@ -4060,7 +4063,10 @@ namespace Azure { namespace Storage { namespace Blobs {
         response.ObjectReplicationDestinationPolicyId
             = pRawResponse->GetHeaders().at("x-ms-or-policy-id");
       }
-      response.BlobType = Models::BlobType(pRawResponse->GetHeaders().at("x-ms-blob-type"));
+      if (pRawResponse->GetHeaders().count("x-ms-blob-type") != 0)
+      {
+        response.BlobType = Models::BlobType(pRawResponse->GetHeaders().at("x-ms-blob-type"));
+      }
       if (pRawResponse->GetHeaders().count("x-ms-copy-completion-time") != 0)
       {
         response.CopyCompletedOn = DateTime::Parse(
diff --git a/sdk/storage/azure-storage-blobs/swagger/README.md b/sdk/storage/azure-storage-blobs/swagger/README.md
index 9370cb0519..4a55faaf90 100644
--- a/sdk/storage/azure-storage-blobs/swagger/README.md
+++ b/sdk/storage/azure-storage-blobs/swagger/README.md
@@ -1044,6 +1044,8 @@ directive:
         $[status_code].headers["x-ms-legal-hold"]["x-nullable"] = true;
         $[status_code].headers["x-ms-immutability-policy-until-date"]["x-ms-client-path"] = "Details.ImmutabilityPolicy.ExpiresOn";
         $[status_code].headers["x-ms-immutability-policy-mode"]["x-ms-client-path"] = "Details.ImmutabilityPolicy.PolicyMode";
+        $[status_code].headers["x-ms-blob-type"]["x-nullable"] = true;
+        $[status_code].headers["x-ms-blob-type"]["x-ms-client-default"] = "";
         delete $[status_code].headers["Accept-Ranges"];
         delete $[status_code].headers["Content-Length"];
         delete $[status_code].headers["Content-Range"];
@@ -1150,6 +1152,8 @@ directive:
       $["x-ms-legal-hold"]["x-ms-client-name"] = "HasLegalHold";
       $["x-ms-legal-hold"]["x-ms-client-default"] = false;
       $["x-ms-legal-hold"]["x-nullable"] = true;
+      $["x-ms-blob-type"]["x-nullable"] = true;
+      $["x-ms-blob-type"]["x-ms-client-default"] = "";
       delete $["Accept-Ranges"];
       delete $["x-ms-or"];
 ```