diff --git a/ament_pep257/ament_pep257/main.py b/ament_pep257/ament_pep257/main.py
index c02e564b6..4accb997d 100755
--- a/ament_pep257/ament_pep257/main.py
+++ b/ament_pep257/ament_pep257/main.py
@@ -130,7 +130,8 @@ def generate_pep257_report(paths, excludes, ignore):
 
     files_dict = {}
     if LooseVersion(pydocstyle.__version__) >= LooseVersion('2.0.0'):
-        for filename, checked_codes, ignore_decorators in files_to_check:
+        # Unpack 3 values for pydocstyle <= 6.1.1 and 4 values for pydocstyle >= 6.2.0
+        for filename, checked_codes, ignore_decorators, *_ in files_to_check:
             if _filename_in_excludes(filename, excludes):
                 continue
             files_dict[filename] = {