diff --git a/src/CodeGenerator/src/Generator/CodeGenerator/TypeGenerator.php b/src/CodeGenerator/src/Generator/CodeGenerator/TypeGenerator.php
index 55040e9c9..595db730c 100644
--- a/src/CodeGenerator/src/Generator/CodeGenerator/TypeGenerator.php
+++ b/src/CodeGenerator/src/Generator/CodeGenerator/TypeGenerator.php
@@ -171,6 +171,7 @@ public function getFilterConstant(Shape $shape): ?string
     {
         switch ($shape->getType()) {
             case 'integer':
+            case 'long':
                 return 'FILTER_VALIDATE_INT';
             case 'boolean':
                 return 'FILTER_VALIDATE_BOOLEAN';
diff --git a/src/Service/S3/src/Result/GetObjectOutput.php b/src/Service/S3/src/Result/GetObjectOutput.php
index cb6748862..d24dc708a 100644
--- a/src/Service/S3/src/Result/GetObjectOutput.php
+++ b/src/Service/S3/src/Result/GetObjectOutput.php
@@ -506,7 +506,7 @@ protected function populateResult(Response $response): void
         $this->expiration = $headers['x-amz-expiration'][0] ?? null;
         $this->restore = $headers['x-amz-restore'][0] ?? null;
         $this->lastModified = isset($headers['last-modified'][0]) ? new \DateTimeImmutable($headers['last-modified'][0]) : null;
-        $this->contentLength = $headers['content-length'][0] ?? null;
+        $this->contentLength = isset($headers['content-length'][0]) ? filter_var($headers['content-length'][0], \FILTER_VALIDATE_INT) : null;
         $this->etag = $headers['etag'][0] ?? null;
         $this->checksumCrc32 = $headers['x-amz-checksum-crc32'][0] ?? null;
         $this->checksumCrc32C = $headers['x-amz-checksum-crc32c'][0] ?? null;
diff --git a/src/Service/S3/src/Result/HeadObjectOutput.php b/src/Service/S3/src/Result/HeadObjectOutput.php
index 38fddb18f..c495a4564 100644
--- a/src/Service/S3/src/Result/HeadObjectOutput.php
+++ b/src/Service/S3/src/Result/HeadObjectOutput.php
@@ -534,7 +534,7 @@ protected function populateResult(Response $response): void
         $this->restore = $headers['x-amz-restore'][0] ?? null;
         $this->archiveStatus = $headers['x-amz-archive-status'][0] ?? null;
         $this->lastModified = isset($headers['last-modified'][0]) ? new \DateTimeImmutable($headers['last-modified'][0]) : null;
-        $this->contentLength = $headers['content-length'][0] ?? null;
+        $this->contentLength = isset($headers['content-length'][0]) ? filter_var($headers['content-length'][0], \FILTER_VALIDATE_INT) : null;
         $this->checksumCrc32 = $headers['x-amz-checksum-crc32'][0] ?? null;
         $this->checksumCrc32C = $headers['x-amz-checksum-crc32c'][0] ?? null;
         $this->checksumSha1 = $headers['x-amz-checksum-sha1'][0] ?? null;