diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index 452724bc81e169b30988ae938ad7897a72ba0600..fbacc7ff025d94da9c05b5a64724056b49da520f 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -11,7 +11,7 @@ class PeopleController < ApplicationController
   def index
     @aspect = :search
     params[:q] ||= params[:term]
-    
+
     if (params[:q][0] == 35 || params[:q][0] == '#') && params[:q].length > 1
       redirect_to "/tags/#{params[:q].gsub("#", "")}"
       return
@@ -71,10 +71,12 @@ class PeopleController < ApplicationController
         if @contact
           @aspects_with_person = @contact.aspects
           @aspect_ids = @aspects_with_person.map(&:id)
-          @contacts_of_contact = @contact.contacts
+          @contacts_of_contact_count = @contact.contacts.count
+          @contacts_of_contact = @contact.contacts.limit(36)
 
         else
           @contact ||= Contact.new
+          @contacts_of_contact_count = 0
           @contacts_of_contact = []
         end
 
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index 9acbd7e6f594f19e9c52a9a6c421cf392565a91d..d70723fca2ced231af9b41c02cb80142939d3cd1 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -17,7 +17,7 @@
       %hr{:style=>"width:300px;"}
       .section.contact_pictures
         %h4
-          = @contacts_of_contact.length
+          = @contacts_of_contact_count
           = t('.similar_contacts')
         - for person in @contacts_of_contact
           = person_image_link person