diff --git a/app/views/projects/changelog.rhtml b/app/views/projects/changelog.rhtml
index c761594..490b857 100644
--- a/app/views/projects/changelog.rhtml
+++ b/app/views/projects/changelog.rhtml
@@ -24,7 +24,8 @@
     <% issues = version.fixed_issues.find(:all,
                                  :include => [:status, :tracker],
                                  :conditions => ["#{IssueStatus.table_name}.is_closed=? AND #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", true],
-                                 :order => "#{Tracker.table_name}.position")
+                                 :order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?
+       issues ||= []
     %>
     <% if !issues.empty? %>
     <ul>
diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml
index 9deb6d2..1011bcb 100644
--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -27,7 +27,8 @@
     <% issues = version.fixed_issues.find(:all,
                                  :include => [:status, :tracker],
                                  :conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],
-                                 :order => "#{Tracker.table_name}.position")
+                                 :order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?
+       issues ||= []
 
        total = issues.size
        complete = issues.inject(0) {|c,i| i.status.is_closed? ? c + 1 : c }