diff --git a/app/routes/devices.py b/app/routes/devices.py
index 33385e6..32d6d35 100644
--- a/app/routes/devices.py
+++ b/app/routes/devices.py
@@ -25,7 +25,7 @@ def index():
     """Show all registered devices, most-recently-seen first."""
     devices = (
         DeviceToken.query
-        .order_by(DeviceToken.registered_at.desc())
+        .order_by(db.func.coalesce(DeviceToken.last_seen_at, DeviceToken.registered_at).desc())
         .all()
     )
     return render_template('admin/devices.html', devices=devices)