diff --git a/app/Http/Transformers/DepreciationReportTransformer.php b/app/Http/Transformers/DepreciationReportTransformer.php
index 33d9a1f5f..00eb984fa 100644
--- a/app/Http/Transformers/DepreciationReportTransformer.php
+++ b/app/Http/Transformers/DepreciationReportTransformer.php
@@ -61,7 +61,7 @@ class DepreciationReportTransformer
         /**
          * Override the previously set null values if there is a valid model and associated depreciation
          */
-        if (($asset->model) && ($asset->model->depreciation)) {
+        if (($asset->model) && ($asset->model->depreciation) && ($asset->model->depreciation->months !== 0)) {
             $depreciated_value = Helper::formatCurrencyOutput($asset->getDepreciatedValue());
             $monthly_depreciation =Helper::formatCurrencyOutput($asset->purchase_cost / $asset->model->depreciation->months);
             $diff = Helper::formatCurrencyOutput(($asset->purchase_cost - $asset->getDepreciatedValue()));
diff --git a/config/session.php b/config/session.php
index 5c6cb27a9..10d0d1acf 100644
--- a/config/session.php
+++ b/config/session.php
@@ -172,7 +172,7 @@ return [
     | More info: https://bootstrap-table.com/docs/extensions/cookie/#cookiestorage
     */
 
-    'bs_table_storage' => env('BS_TABLE_STORAGE', 'cookieStorage'),
+    'bs_table_storage' => env('BS_TABLE_STORAGE', 'localStorage'),
 
 
     /*
diff --git a/tests/Unit/Transformers/DepreciationReportTransformerTest.php b/tests/Unit/Transformers/DepreciationReportTransformerTest.php
new file mode 100644
index 000000000..7a0017196
--- /dev/null
+++ b/tests/Unit/Transformers/DepreciationReportTransformerTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Tests\Unit\Transformers;
+
+use App\Http\Transformers\DepreciationReportTransformer;
+use App\Models\Asset;
+use App\Models\Depreciation;
+use Tests\TestCase;
+
+class DepreciationReportTransformerTest extends TestCase
+{
+    public function testHandlesModelDepreciationMonthsBeingZero()
+    {
+        $asset = Asset::factory()->create();
+        $depreciation = Depreciation::factory()->create(['months' => 0]);
+        $asset->model->depreciation()->associate($depreciation);
+
+        $transformer = new DepreciationReportTransformer;
+
+        $result = $transformer->transformAsset($asset);
+
+        $this->assertIsArray($result);
+    }
+}