diff --git a/superset/jinja_context.py b/superset/jinja_context.py
index e096ded2d55ef..a019ed382807f 100644
--- a/superset/jinja_context.py
+++ b/superset/jinja_context.py
@@ -43,7 +43,7 @@ def url_param(param, default=None):
 
 def current_user_id():
     """The id of the user who is currently logged in"""
-    if g.user:
+    if hasattr(g, 'user') and g.user:
         return g.user.id