diff --git a/aiohttp/helpers.py b/aiohttp/helpers.py
index 55b363003f..895ab5cfc3 100644
--- a/aiohttp/helpers.py
+++ b/aiohttp/helpers.py
@@ -747,11 +747,7 @@ def charset(self) -> Optional[str]:
     def content_length(self) -> Optional[int]:
         """The value of Content-Length HTTP header."""
         content_length = self._headers.get(hdrs.CONTENT_LENGTH)
-
-        if content_length is not None:
-            return int(content_length)
-        else:
-            return None
+        return None if content_length is None else int(content_length)
 
 
 def set_result(fut: "asyncio.Future[_T]", result: _T) -> None:
diff --git a/aiohttp/web_response.py b/aiohttp/web_response.py
index d2f056299e..db58483682 100644
--- a/aiohttp/web_response.py
+++ b/aiohttp/web_response.py
@@ -646,7 +646,7 @@ def content_length(self) -> Optional[int]:
             return None
 
         if hdrs.CONTENT_LENGTH in self._headers:
-            return super().content_length
+            return int(self._headers[hdrs.CONTENT_LENGTH])
 
         if self._compressed_body is not None:
             # Return length of the compressed body