diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/download_async.py b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/download_async.py
index 6e332c74d55f..6cfe6893bf6f 100644
--- a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/download_async.py
+++ b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/download_async.py
@@ -130,12 +130,12 @@ def _do_optimize(self, given_range_start, given_range_end):
             return False
 
         for source_range in self.non_empty_ranges:
-            if given_range_end < source_range['start']:
+            if given_range_end < source_range['start']:  # pylint:disable=no-else-return
                 return True
             elif source_range['end'] < given_range_start:
                 pass
-
-            return False
+            else:
+                return False
 
         return True
 
diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/download.py b/sdk/storage/azure-storage-blob/azure/storage/blob/download.py
index 42ccc28bf7a9..b4b86cfd7ff1 100644
--- a/sdk/storage/azure-storage-blob/azure/storage/blob/download.py
+++ b/sdk/storage/azure-storage-blob/azure/storage/blob/download.py
@@ -60,7 +60,7 @@ def process_content(data, start_offset, end_offset, encryption):
     return content
 
 
-class _ChunkDownloader(object):
+class _ChunkDownloader(object):  # pylint: disable=too-many-instance-attributes
     def __init__(
         self,
         client=None,
@@ -137,12 +137,12 @@ def _do_optimize(self, given_range_start, given_range_end):
             return False
 
         for source_range in self.non_empty_ranges:
-            if given_range_end < source_range['start']:
+            if given_range_end < source_range['start']:  # pylint:disable=no-else-return
                 return True
             elif source_range['end'] < given_range_start:
                 pass
-
-            return False
+            else:
+                return False
 
         return True