diff --git a/plugins/organization_ratings/lib/average_rating_block.rb b/plugins/organization_ratings/lib/average_rating_block.rb
index 5e0e378..088b17a 100644
--- a/plugins/organization_ratings/lib/average_rating_block.rb
+++ b/plugins/organization_ratings/lib/average_rating_block.rb
@@ -11,14 +11,16 @@ class AverageRatingBlock < Block
 
   def content(args = {})
     profile_identifier = self.owner.identifier
-    average_rating = OrganizationRating.average_rating self.owner.id
+    statistics = OrganizationRating.statistics_for_profile self.owner
+    block = self
 
     proc do
       render(
         :file => 'blocks/display_organization_average_rating',
         :locals => {
           :profile_identifier => profile_identifier,
-          :average_rating => average_rating
+          :average_rating => statistics[:average],
+          :block => block
         }
       )
     end
diff --git a/plugins/organization_ratings/lib/organization_ratings_plugin.rb b/plugins/organization_ratings/lib/organization_ratings_plugin.rb
index a3aab45..aa952de 100644
--- a/plugins/organization_ratings/lib/organization_ratings_plugin.rb
+++ b/plugins/organization_ratings/lib/organization_ratings_plugin.rb
@@ -38,13 +38,14 @@ class OrganizationRatingsPlugin < Noosfero::Plugin
   # Plugin Hotspot to display the average rating
   def display_organization_average_rating organization
     unless organization.nil?
-      average_rating = OrganizationRating.average_rating organization.id
+      average_rating = OrganizationRating.statistics_for_profile organization
 
       Proc::new {
         render :file => 'blocks/display_organization_average_rating',
                :locals => {
+                 :statistics => average_rating,
                  :profile_identifier => organization.identifier,
-                 :average_rating => average_rating
+                 :average_rating => average_rating[:average]
                }
       }
     end
diff --git a/plugins/organization_ratings/views/blocks/display_organization_average_rating.html.erb b/plugins/organization_ratings/views/blocks/display_organization_average_rating.html.erb
index ec5665d..42f63aa 100644
--- a/plugins/organization_ratings/views/blocks/display_organization_average_rating.html.erb
+++ b/plugins/organization_ratings/views/blocks/display_organization_average_rating.html.erb
@@ -1,4 +1,4 @@
-<% statistics = OrganizationRating.statistics_for_profile block.owner %>
+<% statistics ||= OrganizationRating.statistics_for_profile block.owner %>
 
 <div class="organization-average-rating-container">
   <% if statistics[:average] %>
--
libgit2 0.21.2