diff --git a/CHANGES b/CHANGES
index d0e4e6316cc..bddfe7f5a98 100644
--- a/CHANGES
+++ b/CHANGES
@@ -40,6 +40,8 @@ Bugs fixed
 * #8074: napoleon: Crashes during processing C-ext module
 * #8084: autodoc: KeyError is raised on documenting an attribute of the broken
   class
+* #8085: autodoc: AttributeError is raised on documenting an attribute on Python
+  3.5.2
 
 Testing
 --------
diff --git a/sphinx/ext/autodoc/__init__.py b/sphinx/ext/autodoc/__init__.py
index 47f6bcb2506..f3820f71552 100644
--- a/sphinx/ext/autodoc/__init__.py
+++ b/sphinx/ext/autodoc/__init__.py
@@ -1613,6 +1613,9 @@ def add_directive_header(self, sig: str) -> None:
             except KeyError:
                 # a broken class found (refs: https://github.com/sphinx-doc/sphinx/issues/8084)
                 annotations = {}
+            except AttributeError:
+                # AttributeError is raised on 3.5.2 (fixed by 3.5.3)
+                annotations = {}
 
             if self.objpath[-1] in annotations:
                 objrepr = stringify_typehint(annotations.get(self.objpath[-1]))
@@ -1986,6 +1989,9 @@ def add_directive_header(self, sig: str) -> None:
             except KeyError:
                 # a broken class found (refs: https://github.com/sphinx-doc/sphinx/issues/8084)
                 annotations = {}
+            except AttributeError:
+                # AttributeError is raised on 3.5.2 (fixed by 3.5.3)
+                annotations = {}
 
             if self.objpath[-1] in annotations:
                 objrepr = stringify_typehint(annotations.get(self.objpath[-1]))