diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index a301d270d..f6ec09b2a 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -51,7 +51,7 @@ class BoardsController < ApplicationController
             @boards = @course.boards.includes(:last_message => :author).all
           end
         end
-        if @boards.size == 1
+        unless @course.boards.empty?
           @board = @course.boards.first
         end
         show and return