diff --git a/resources/views/components/db-sort.blade.php b/resources/views/components/db-sort.blade.php
index edbe08c..d677d43 100644
--- a/resources/views/components/db-sort.blade.php
+++ b/resources/views/components/db-sort.blade.php
@@ -1,8 +1,8 @@
 <span class="sm:inline-block block">
-    <a href="?search={{ $search }}&sort={{ $sort }}">
+    <a href="?search={{ $search }}&type={{ $type }}&sort={{ $sort }}">
         <x-hi-chevron-up />
     </a>
-    <a href="?search={{ $search }}&sort={{ $sort }}&order=desc">
+    <a href="?search={{ $search }}&type={{ $type }}&sort={{ $sort }}&order=desc">
         <x-hi-chevron-down />
     </a>
 </span>
diff --git a/resources/views/livewire/search-devices.blade.php b/resources/views/livewire/search-devices.blade.php
index 636f070..d231776 100644
--- a/resources/views/livewire/search-devices.blade.php
+++ b/resources/views/livewire/search-devices.blade.php
@@ -8,21 +8,21 @@
 
             <x-slot:thead>
                 <x-th>{{ __('common.mac') }}
-                    <x-db-sort :search="$search" sort="mac" />
+                    <x-db-sort :search="$search" :type="$type" sort="mac" />
                 </x-th>
                 <x-th>{{ __('common.type') }}
                 </x-th>
                 <x-th>{{ __('common.name') }}
-                    <x-db-sort :search="$search" sort="name" />
+                    <x-db-sort :search="$search" :type="$type" sort="name" />
                 </x-th>
                 <x-th>{{ __('common.enabled') }}
-                    <x-db-sort :search="$search" sort="enabled" />
+                    <x-db-sort :search="$search" :type="$type" sort="enabled" />
                 </x-th>
                 <x-th>{{ __('common.valid_from') }}
-                    <x-db-sort :search="$search" sort="valid_from" />
+                    <x-db-sort :search="$search" :type="$type" sort="valid_from" />
                 </x-th>
                 <x-th>{{ __('common.valid_to') }}
-                    <x-db-sort :search="$search" sort="valid_to" />
+                    <x-db-sort :search="$search" :type="$type" sort="valid_to" />
                 </x-th>
                 <x-th>&nbsp;</x-th>
             </x-slot:thead>