diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml
index 00bf9dcd2d583b638f02478b95d5acb450532877..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
+- 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']
diff --git a/features/project/fork.feature b/features/project/fork.feature
index 12695204e4718a2458022592386e792f53a2e878..ca3f2771aa50a85bf63d5fa948e22eb0050f2cda 100644
--- a/features/project/fork.feature
+++ b/features/project/fork.feature
@@ -32,6 +32,13 @@ Feature: Project Fork
     And I visit the forks page of the "Shop" project
     Then I should see my fork on the list
 
+  Scenario: Viewing forks of a Project that has no repo
+    Given I click link "Fork"
+    When I fork to my namespace
+    And I make forked repo invalid
+    And I visit the forks page of the "Shop" project
+    Then I should see my fork on the list
+
   Scenario: Viewing private forks of a Project
     Given There is an existent fork of the "Shop" project
     And I click link "Fork"
diff --git a/features/steps/project/fork.rb b/features/steps/project/fork.rb
index 5810276ced3eb88b31334ecdab5ef7e550b9ff61..527f7853da9f093a2ea9f1ddce752ec403f7a534 100644
--- a/features/steps/project/fork.rb
+++ b/features/steps/project/fork.rb
@@ -62,6 +62,12 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
     end
   end
 
+  step 'I make forked repo invalid' do
+    project = @user.fork_of(@project)
+    project.path = 'test-crappy-path'
+    project.save!
+  end
+
   step 'There is an existent fork of the "Shop" project' do
     user = create(:user, name: 'Mike')
     @forked_project = Projects::ForkService.new(@project, user).execute