diff --git a/server.py b/server.py
index 538a27a0..b4c2e9ee 100644
--- a/server.py
+++ b/server.py
@@ -306,7 +306,7 @@ def fake_data():
 @login_manager.user_loader
 def load_user(user_id):
     user = User.get(user_id)
-    if user.disabled:
+    if user and user.disabled:
         return None
 
     return user