diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_shared/request_handlers.py b/sdk/storage/azure-storage-blob/azure/storage/blob/_shared/request_handlers.py
index 2ce74d43db2..4f15b65a4b6 100644
--- a/sdk/storage/azure-storage-blob/azure/storage/blob/_shared/request_handlers.py
+++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_shared/request_handlers.py
@@ -143,5 +143,5 @@ def add_metadata_headers(metadata=None):
     headers = {}
     if metadata:
         for key, value in metadata.items():
-            headers['x-ms-meta-{}'.format(key)] = value
+            headers['x-ms-meta-{}'.format(key.strip())] = value.strip() if value else value
     return headers
diff --git a/sdk/storage/azure-storage-blob/tests/test_common_blob.py b/sdk/storage/azure-storage-blob/tests/test_common_blob.py
index 0878effb3f1..c3dec9083dd 100644
--- a/sdk/storage/azure-storage-blob/tests/test_common_blob.py
+++ b/sdk/storage/azure-storage-blob/tests/test_common_blob.py
@@ -587,7 +587,7 @@ def test_set_blob_metadata_with_upper_case(self, resource_group, location, stora
         # bug in devtools...converts upper case header to lowercase
         # passes live.
         self._setup(storage_account, storage_account_key)
-        metadata = {'hello': 'world', 'number': '42', 'UP': 'UPval'}
+        metadata = {'hello': ' world ', ' number ': '42', 'UP': 'UPval'}
         blob_name = self._create_block_blob()
 
         # Act
diff --git a/sdk/storage/azure-storage-blob/tests/test_common_blob_async.py b/sdk/storage/azure-storage-blob/tests/test_common_blob_async.py
index 614b90d411a..c8132e0b466 100644
--- a/sdk/storage/azure-storage-blob/tests/test_common_blob_async.py
+++ b/sdk/storage/azure-storage-blob/tests/test_common_blob_async.py
@@ -692,7 +692,7 @@ async def test_set_blob_metadata_with_upper_case(self, resource_group, location,
         # passes live.
         # Arrange
         await self._setup(storage_account, storage_account_key)
-        metadata = {'hello': 'world', 'number': '42', 'UP': 'UPval'}
+        metadata = {'hello': ' world ', ' number ': '42', 'UP': 'UPval'}
         blob_name = await self._create_block_blob()
 
         # Act
diff --git a/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_shared/request_handlers.py b/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_shared/request_handlers.py
index 2ce74d43db2..4f15b65a4b6 100644
--- a/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_shared/request_handlers.py
+++ b/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_shared/request_handlers.py
@@ -143,5 +143,5 @@ def add_metadata_headers(metadata=None):
     headers = {}
     if metadata:
         for key, value in metadata.items():
-            headers['x-ms-meta-{}'.format(key)] = value
+            headers['x-ms-meta-{}'.format(key.strip())] = value.strip() if value else value
     return headers
diff --git a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_shared/request_handlers.py b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_shared/request_handlers.py
index 2ce74d43db2..4f15b65a4b6 100644
--- a/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_shared/request_handlers.py
+++ b/sdk/storage/azure-storage-file-share/azure/storage/fileshare/_shared/request_handlers.py
@@ -143,5 +143,5 @@ def add_metadata_headers(metadata=None):
     headers = {}
     if metadata:
         for key, value in metadata.items():
-            headers['x-ms-meta-{}'.format(key)] = value
+            headers['x-ms-meta-{}'.format(key.strip())] = value.strip() if value else value
     return headers
diff --git a/sdk/storage/azure-storage-queue/azure/storage/queue/_shared/request_handlers.py b/sdk/storage/azure-storage-queue/azure/storage/queue/_shared/request_handlers.py
index 2ce74d43db2..4f15b65a4b6 100644
--- a/sdk/storage/azure-storage-queue/azure/storage/queue/_shared/request_handlers.py
+++ b/sdk/storage/azure-storage-queue/azure/storage/queue/_shared/request_handlers.py
@@ -143,5 +143,5 @@ def add_metadata_headers(metadata=None):
     headers = {}
     if metadata:
         for key, value in metadata.items():
-            headers['x-ms-meta-{}'.format(key)] = value
+            headers['x-ms-meta-{}'.format(key.strip())] = value.strip() if value else value
     return headers