diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php
index 6c704087b7..bfe4b11334 100644
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -37,6 +37,8 @@ class AssetsTransformer
             'location' => ($asset->assetLoc) ? $asset->assetLoc : null,
             'image' => ($asset->getImageUrl()) ? $asset->getImageUrl() : null,
             'assigned_to' => ($asset->assigneduser) ? (new UsersTransformer)->transformUser($asset->assigneduser) : null,
+            'warranty' =>  ($asset->warranty_months > 0) ? $asset->warranty_months.' '.trans('admin/hardware/form.months') : null,
+            'warranty_expires' => ($asset->warranty_months > 0) ?  $asset->present()->warrantee_expires() : null,
             'created_at' => $asset->created_at,
             'purchase_date' => $asset->purchase_date,
             'purchase_cost' => $asset->purchase_cost,
diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php
index 32690a7a3e..22ad9005d8 100755
--- a/resources/views/hardware/index.blade.php
+++ b/resources/views/hardware/index.blade.php
@@ -93,6 +93,8 @@
                     <th data-sortable="true" data-searchable="true"  data-field="order_number">{{ trans('admin/hardware/form.order') }}</th>
                     <th data-sortable="true" data-searchable="true" data-field="last_checkout">{{ trans('admin/hardware/table.checkout_date') }}</th>
                     <th data-sortable="true" data-field="expected_checkin" data-searchable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
+                      <th data-sortable="false" data-field="warranty">{{ trans('admin/hardware/form.warranty') }}</th>
+                      <th data-sortable="false" data-field="warranty_expires">{{ trans('admin/hardware/form.expires') }}</th>
                     @foreach(\App\Models\CustomField::all() as $field)