diff --git a/cmd/mautrix-telegram/legacymigrate.sql b/cmd/mautrix-telegram/legacymigrate.sql
index 048b1776..c4af3448 100644
--- a/cmd/mautrix-telegram/legacymigrate.sql
+++ b/cmd/mautrix-telegram/legacymigrate.sql
@@ -234,7 +234,8 @@ SELECT
     expiration_seconds * 1000000000,
     expiration_ts * 1000000
 FROM disappearing_message_old
-WHERE expiration_ts<9999999999999 AND expiration_seconds<999999;
+WHERE expiration_ts<9999999999999 AND expiration_seconds<999999
+  AND room_id IN (SELECT mxid FROM portal WHERE mxid IS NOT NULL);
 
 -- TODO do something with the bot_chat table?
 
diff --git a/cmd/mautrix-telegram/main.go b/cmd/mautrix-telegram/main.go
index bf37881b..9c0be560 100644
--- a/cmd/mautrix-telegram/main.go
+++ b/cmd/mautrix-telegram/main.go
@@ -107,7 +107,7 @@ func main() {
 			"v0.14.0",
 			"v0.16.0",
 			m.LegacyMigrateWithAnotherUpgrader(
-				legacyMigrateRenameTables, legacyMigrateCopyData, 16,
+				legacyMigrateRenameTables, legacyMigrateCopyData, 21,
 				upgrades.Table, "telegram_version", 2,
 			),
 			true,