diff --git a/app/Jobs/Common/CreateItemTaxes.php b/app/Jobs/Common/CreateItemTaxes.php
index e0d808d6d..ec7b93231 100644
--- a/app/Jobs/Common/CreateItemTaxes.php
+++ b/app/Jobs/Common/CreateItemTaxes.php
@@ -26,26 +26,26 @@ class CreateItemTaxes extends Job
     /**
      * Execute the job.
      *
-     * @return Item
+     * @return mixed
      */
     public function handle()
     {
+        // BC for 2.0 version
+        if (!empty($this->request['tax_id'])) {
+            $this->request['tax_ids'][] = $this->request['tax_id'];
+        }
+
+        if (empty($this->request['tax_ids'])) {
+            return false;
+        }
+
         \DB::transaction(function () {
-            // This controller for BC < 2.1
-            if (!empty($this->request['tax_id'])) {
+            foreach ($this->request['tax_ids'] as $tax_id) {
                 ItemTax::create([
                     'company_id' => $this->item->company_id,
                     'item_id' => $this->item->id,
-                    'tax_id' => $this->request['tax_id']
+                    'tax_id' => $tax_id,
                 ]);
-            } else {
-                foreach ($this->request['tax_ids'] as $tax_id) {
-                    ItemTax::create([
-                        'company_id' => $this->item->company_id,
-                        'item_id' => $this->item->id,
-                        'tax_id' => $tax_id
-                    ]);
-                }
             }
         });
 
diff --git a/database/factories/Item.php b/database/factories/Item.php
index b78798bf4..b90b43df0 100644
--- a/database/factories/Item.php
+++ b/database/factories/Item.php
@@ -28,7 +28,6 @@ class Item extends Factory
             'purchase_price' => $this->faker->randomFloat(2, 10, 20),
             'sale_price' => $this->faker->randomFloat(2, 10, 20),
             'category_id' => $this->company->categories()->item()->get()->random(1)->pluck('id')->first(),
-            'tax_ids' => [],
             'enabled' => $this->faker->boolean ? 1 : 0,
         ];
     }
diff --git a/tests/Feature/Common/ItemsTest.php b/tests/Feature/Common/ItemsTest.php
index d5506092e..0f6559199 100644
--- a/tests/Feature/Common/ItemsTest.php
+++ b/tests/Feature/Common/ItemsTest.php
@@ -34,7 +34,7 @@ class ItemsTest extends FeatureTestCase
 
 		$this->assertFlashLevel('success');
 
-		$this->assertDatabaseHas('items', $this->getAssertRequest($request));
+		$this->assertDatabaseHas('items', $request);
 	}
 
 	public function testItShouldSeeItemUpdatePage()
@@ -64,7 +64,7 @@ class ItemsTest extends FeatureTestCase
 
 		$this->assertFlashLevel('success');
 
-		$this->assertDatabaseHas('items', $this->getAssertRequest($request));
+		$this->assertDatabaseHas('items', $request);
 	}
 
 	public function testItShouldDeleteItem()
@@ -79,18 +79,11 @@ class ItemsTest extends FeatureTestCase
 
 		$this->assertFlashLevel('success');
 
-		$this->assertSoftDeleted('items', $this->getAssertRequest($request));
+		$this->assertSoftDeleted('items', $request);
 	}
 
     public function getRequest()
     {
         return Item::factory()->enabled()->raw();
     }
-
-    public function getAssertRequest($request)
-    {
-        unset($request['tax_ids']);
-
-        return $request;
-    }
 }