diff --git a/discord/user.py b/discord/user.py
index ce68775f6..c05d9aa1d 100644
--- a/discord/user.py
+++ b/discord/user.py
@@ -133,5 +133,5 @@ class User:
         if they have a server specific nickname then that
         is returned instead.
         """
-        return getattr(self, 'nick', self.name)
+        return getattr(self, 'nick', None) or self.name