diff --git a/lib/pages/device_settings.dart b/lib/pages/device_settings.dart
index 735aedb3..b4e80721 100644
--- a/lib/pages/device_settings.dart
+++ b/lib/pages/device_settings.dart
@@ -133,7 +133,7 @@ class DevicesSettingsController extends State<DevicesSettings> {
 
   List<Device> get notThisDevice => List<Device>.from(devices)
     ..removeWhere(_isOwnDevice)
-    ..sort((a, b) => b.lastSeenTs.compareTo(a.lastSeenTs));
+    ..sort((a, b) => (b.lastSeenTs ?? 0).compareTo(a.lastSeenTs ?? 0));
 
   @override
   Widget build(BuildContext context) => DevicesSettingsView(this);