diff --git a/keyserver/internal/device_list_update.go b/keyserver/internal/device_list_update.go
index 8741f597d..19d8463d8 100644
--- a/keyserver/internal/device_list_update.go
+++ b/keyserver/internal/device_list_update.go
@@ -290,5 +290,9 @@ func (u *DeviceListUpdater) updateDeviceList(ctx context.Context, res *gomatrixs
 			},
 		}
 	}
-	return u.db.StoreRemoteDeviceKeys(ctx, keys)
+	err := u.db.StoreRemoteDeviceKeys(ctx, keys)
+	if err != nil {
+		return err
+	}
+	return u.db.MarkDeviceListStale(ctx, res.UserID, false)
 }