diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 2f84dcfa67f5fc8212cc48664dc1e172d17da5d9..376f70b963d2fccec5b48c40465dd477ce723f3e 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -345,7 +345,18 @@ a.deploy-project-label {
         background-color: #fcfdff;
         border-color: #e6f4ff;
       }
-
+      .no-avatar {
+        width: 100px;
+        height: 100px;
+        background-color: $gray-light;
+        border: 1px solid $gray-dark;
+        margin: 0 auto;
+        @include border-radius(50%);
+        i {
+          font-size: 100px;
+          color: $gray-dark;
+        }
+      }
       a {
         display: block;
         width: 100%;
diff --git a/app/views/projects/forks/new.html.haml b/app/views/projects/forks/new.html.haml
index ebb994406def9c26ce3c6bcc207c84ea0d06b907..5242bc72b716d4eb40489668a2e3fa87911d6b8d 100644
--- a/app/views/projects/forks/new.html.haml
+++ b/app/views/projects/forks/new.html.haml
@@ -17,16 +17,25 @@
           - @namespaces.in_groups_of(6, false) do |group|
             .row
               - group.each do |namespace|
+                - avatar = namespace_icon(namespace, 100)
                 - if fork = namespace.find_fork_of(@project)
                   .fork-thumbnail.forked
                     = link_to project_path(fork) do
-                      = image_tag namespace_icon(namespace, 100)
+                      - if /no_((\w*)_)*avatar/.match(avatar)
+                        .no-avatar
+                          = icon 'question'
+                      - else
+                        = image_tag avatar
                       .caption
                         = namespace.human_name
                 - else
                   .fork-thumbnail
                     = link_to namespace_project_forks_path(@project.namespace, @project, namespace_key: namespace.id), method: "POST" do
-                      = image_tag namespace_icon(namespace, 100)
+                      - if /no_((\w*)_)*avatar/.match(avatar)
+                        .no-avatar
+                          = icon 'question'
+                      - else
+                        = image_tag avatar
                       .caption
                         = namespace.human_name
       - else