diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 9c9677a22c8..837b6d5b23d 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -60,7 +60,7 @@ class ProjectsController < ApplicationController
     @events = event_filter.apply_filter(@events)
     @events = @events.limit(limit).offset(params[:offset] || 0)
 
-    @show_star = !(current_user and current_user.starred?(@project))
+    @show_star = !(current_user && current_user.starred?(@project))
 
     respond_to do |format|
       format.html do