diff --git a/app/services/boards/base_service.rb b/app/services/boards/base_service.rb
index b2069ca825a3c3370a11c06351ddacd53ccd5401..7eacacbaf7e1d15e6812982b0b6c043089bebd8e 100644
--- a/app/services/boards/base_service.rb
+++ b/app/services/boards/base_service.rb
@@ -1,5 +1,4 @@
 module Boards
   class BaseService < ::BaseService
-    delegate :board, to: :project
   end
 end
diff --git a/app/services/boards/lists/create_service.rb b/app/services/boards/lists/create_service.rb
index b1887820bd4f2625ae2517993e7ed12316985870..da6f59c03997a12720dbc9e8db403f68c55708c3 100644
--- a/app/services/boards/lists/create_service.rb
+++ b/app/services/boards/lists/create_service.rb
@@ -1,23 +1,23 @@
 module Boards
   module Lists
     class CreateService < Boards::BaseService
-      def execute
+      def execute(board)
         List.transaction do
           label    = project.labels.find(params[:label_id])
-          position = next_position
+          position = next_position(board)
 
-          create_list(label, position)
+          create_list(board, label, position)
         end
       end
 
       private
 
-      def next_position
+      def next_position(board)
         max_position = board.lists.movable.maximum(:position)
         max_position.nil? ? 0 : max_position.succ
       end
 
-      def create_list(label, position)
+      def create_list(board, label, position)
         board.lists.create(label: label, list_type: :label, position: position)
       end
     end
diff --git a/spec/services/boards/lists/create_service_spec.rb b/spec/services/boards/lists/create_service_spec.rb
index bff9c1fd1fe246d37b25bc4398209aed5f3bb845..e7806add9162855c4f6545949d06291a6d0be86c 100644
--- a/spec/services/boards/lists/create_service_spec.rb
+++ b/spec/services/boards/lists/create_service_spec.rb
@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Boards::Lists::CreateService, services: true do
   describe '#execute' do
-    let(:project) { create(:project_with_board) }
-    let(:board)   { project.board }
+    let(:project) { create(:empty_project) }
+    let(:board)   { create(:board, project: project) }
     let(:user)    { create(:user) }
     let(:label)   { create(:label, project: project, name: 'in-progress') }
 
@@ -11,7 +11,7 @@ describe Boards::Lists::CreateService, services: true do
 
     context 'when board lists is empty' do
       it 'creates a new list at beginning of the list' do
-        list = service.execute
+        list = service.execute(board)
 
         expect(list.position).to eq 0
       end
@@ -19,7 +19,7 @@ describe Boards::Lists::CreateService, services: true do
 
     context 'when board lists has backlog, and done lists' do
       it 'creates a new list at beginning of the list' do
-        list = service.execute
+        list = service.execute(board)
 
         expect(list.position).to eq 0
       end
@@ -30,7 +30,7 @@ describe Boards::Lists::CreateService, services: true do
         create(:list, board: board, position: 0)
         create(:list, board: board, position: 1)
 
-        list = service.execute
+        list = service.execute(board)
 
         expect(list.position).to eq 2
       end
@@ -40,7 +40,7 @@ describe Boards::Lists::CreateService, services: true do
       it 'creates a new list at end of the label lists' do
         list1 = create(:list, board: board, position: 0)
 
-        list2 = service.execute
+        list2 = service.execute(board)
 
         expect(list1.reload.position).to eq 0
         expect(list2.reload.position).to eq 1
@@ -52,7 +52,7 @@ describe Boards::Lists::CreateService, services: true do
         label = create(:label, name: 'in-development')
         service = described_class.new(project, user, label_id: label.id)
 
-        expect { service.execute }.to raise_error(ActiveRecord::RecordNotFound)
+        expect { service.execute(board) }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
   end