diff --git a/azure-storage-common/src/Common/SharedAccessSignatureHelper.php b/azure-storage-common/src/Common/SharedAccessSignatureHelper.php
index d5cc81f4..c39bbf74 100644
--- a/azure-storage-common/src/Common/SharedAccessSignatureHelper.php
+++ b/azure-storage-common/src/Common/SharedAccessSignatureHelper.php
@@ -165,8 +165,8 @@ public function generateAccountSharedAccessSignatureToken(
         $sas .= '&ss=' . $signedService;
         $sas .= '&srt=' . $signedResourceType;
         $sas .= '&sp=' . $signedPermissions;
-        $sas .= '&se=' . $signedExpiry;
-        $sas .= $signedStart === ''? '' : '&st=' . $signedStart;
+        $sas .= '&se=' . urlencode($signedExpiry);
+        $sas .= $signedStart === ''? '' : '&st=' . urlencode($signedStart);
         $sas .= $signedIP === ''? '' : '&sip=' . $signedIP;
         $sas .= '&spr=' . $signedProtocol;
         $sas .= '&sig=' . $sig;