diff --git a/app/models/plan.rb b/app/models/plan.rb
index 91e17a5..f1f2a9d 100644
--- a/app/models/plan.rb
+++ b/app/models/plan.rb
@@ -63,7 +63,7 @@
 
   # Retrieves any plan organisationally or publicly visible for a given org id
   scope :organisationally_or_publicly_visible, -> (user) {
-    Plan.joins(:template)
+    Plan.includes(:template)
       .where({
         visibility: [visibilities[:organisationally_visible], visibilities[:publicly_visible]],
         "templates.org_id": user.org_id})
diff --git a/app/views/plans/index.html.erb b/app/views/plans/index.html.erb
index c014d1d..a1294a7 100644
--- a/app/views/plans/index.html.erb
+++ b/app/views/plans/index.html.erb
@@ -107,7 +107,9 @@
 </div>
 <div class="row">
   <div class="col-md-12">
-    <%= render partial: 'publicly_visible_org', locals: { plans: @organisationally_or_publicly_visible, paginable: @paginable } %>
+    <% if @organisationally_or_publicly_visible.length > 0 %>
+      <%= render partial: 'publicly_visible_org', locals: { plans: @organisationally_or_publicly_visible, paginable: @paginable } %>
+    <% end %>
   </div>
 </div>