diff --git a/app/views/projects/forks/index.html.haml b/app/views/projects/forks/index.html.haml
index 3e636533bb4e9f60a257236079ac836d1de03243..42fa6fdb782709d43fef3eaf7cba0eeb4d601018 100644
--- a/app/views/projects/forks/index.html.haml
+++ b/app/views/projects/forks/index.html.haml
@@ -30,7 +30,7 @@
             = sort_title_oldest_updated
 
     - if current_user && can?(current_user, :fork_project, @project)
-      - if current_user && current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
+      - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
         = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn btn-new' do
           = icon('code-fork fw')
           Fork
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml
index 900d7939ae9ef5df939cc87b66aa1f1aab803498..97db5b1d41e3ecc8b7842acd846701305e6f8e26 100644
--- a/app/views/shared/projects/_project.html.haml
+++ b/app/views/shared/projects/_project.html.haml
@@ -4,7 +4,7 @@
 - ci = false unless local_assigns[:ci] == true
 - skip_namespace = false unless local_assigns[:skip_namespace] == true
 - css_class = '' unless local_assigns[:css_class]
-- show_last_commit_as_description = false unless local_assigns[:show_last_commit_as_description] == true && !project.empty_repo? && project.commit
+- show_last_commit_as_description = false unless local_assigns[:show_last_commit_as_description] == true && project.commit
 - css_class += " no-description" if project.description.blank? && !show_last_commit_as_description
 - ci_commit = project.ci_commit(project.commit.sha) if ci && !project.empty_repo? && project.commit
 - cache_key = [project.namespace, project, controller.controller_name, controller.action_name, current_application_settings, 'v2.2']