diff --git a/frontend/src/components/audit/AuditLogTable.tsx b/frontend/src/components/audit/AuditLogTable.tsx
index 32d356f..0a813fc 100644
--- a/frontend/src/components/audit/AuditLogTable.tsx
+++ b/frontend/src/components/audit/AuditLogTable.tsx
@@ -22,7 +22,7 @@ import {
   type AuditLogParams,
 } from '@/lib/api'
 import { cn } from '@/lib/utils'
-import { DeviceLink } from '@/components/ui/DeviceLink'
+import { DeviceLink } from '@/components/ui/device-link'
 import { EmptyState } from '@/components/ui/empty-state'
 
 // Predefined action types for the filter dropdown
diff --git a/frontend/src/components/config/BatchConfigPanel.tsx b/frontend/src/components/config/BatchConfigPanel.tsx
index cccd7b5..f0136e1 100644
--- a/frontend/src/components/config/BatchConfigPanel.tsx
+++ b/frontend/src/components/config/BatchConfigPanel.tsx
@@ -243,7 +243,7 @@ function DeviceSelector({
                     />
                   </td>
                   <td className="px-3 py-2 font-medium">
-                    <DeviceLink tenantId={tenantId} deviceId={device.id}>{device.hostname}</DeviceLink>
+                    {device.hostname}
                   </td>
                   <td className="px-3 py-2 font-mono text-text-secondary">{device.ip_address}</td>
                   <td className="px-3 py-2">
diff --git a/frontend/src/components/templates/TemplatePushWizard.tsx b/frontend/src/components/templates/TemplatePushWizard.tsx
index 7fa927c..c064b26 100644
--- a/frontend/src/components/templates/TemplatePushWizard.tsx
+++ b/frontend/src/components/templates/TemplatePushWizard.tsx
@@ -29,7 +29,6 @@ import {
   type TemplateResponse,
 } from '@/lib/templatesApi'
 import { deviceGroupsApi, metricsApi } from '@/lib/api'
-import { DeviceLink } from '@/components/ui/device-link'
 import { PushProgressPanel } from './PushProgressPanel'
 
 interface TemplatePushWizardProps {
@@ -201,7 +200,7 @@ export function TemplatePushWizard({ open, onClose, tenantId, template }: Templa
                       onCheckedChange={() => toggleDevice(device.id)}
                     />
                     <div className="flex-1 min-w-0">
-                      <div className="text-xs text-text-primary truncate"><DeviceLink tenantId={tenantId} deviceId={device.id}>{device.hostname}</DeviceLink></div>
+                      <div className="text-xs text-text-primary truncate">{device.hostname}</div>
                       <div className="text-[10px] text-text-muted">{device.ip_address}</div>
                     </div>
                     <div