diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index d184342ef..f72e7dfa0 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -1072,7 +1072,8 @@ class AttributeDocumenter(ClassLevelDocumenter):
     @classmethod
     def can_document_member(cls, member, membername, isattr, parent):
         isdatadesc = isdescriptor(member) and not \
-                     isinstance(member, cls.method_types)
+                     isinstance(member, cls.method_types) and not \
+                     type(member).__name__ == "method_descriptor"
         return isdatadesc or \
                (isattr and not isinstance(parent, ModuleDocumenter))