diff --git a/lib/galaxy/webapps/community/controllers/repository.py b/lib/galaxy/webapps/community/controllers/repository.py
index 4ed323521db..97d0834d392 100644
--- a/lib/galaxy/webapps/community/controllers/repository.py
+++ b/lib/galaxy/webapps/community/controllers/repository.py
@@ -117,7 +117,7 @@ class RepositoryListGrid( grids.Grid ):
                                        model.User.table.c.email == column_filter ) )
     class EmailAlertsColumn( grids.TextColumn ):
         def get_value( self, trans, grid, repository ):
-            if trans.user.email in from_json_string( repository.email_alerts ):
+            if repository.email_alerts and trans.user.email in from_json_string( repository.email_alerts ):
                 return 'yes'
             return ''
     # Grid definition