diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 2110ee1d..2adea3c9 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -94,8 +94,12 @@ class ProjectsController < ApplicationController
     @not_done = @project.todos.active_or_hidden(:include => Todo::DEFAULT_INCLUDES)
     @deferred = @project.todos.deferred(:include => Todo::DEFAULT_INCLUDES)
     @pending = @project.todos.pending(:include => Todo::DEFAULT_INCLUDES)
+
+    @done = {}
     @done = @project.todos.find_in_state(:all, :completed,
-      :order => "todos.completed_at DESC", :limit => current_user.prefs.show_number_completed, :include => Todo::DEFAULT_INCLUDES)
+                                         :order => "todos.completed_at DESC",
+                                         :limit => current_user.prefs.show_number_completed,
+                                         :include => Todo::DEFAULT_INCLUDES) unless current_user.prefs.show_number_completed == 0
 
     @count = @not_done.size
     @down_count = @count + @deferred.size + @pending.size