diff --git a/xwords4/linux/scripts/discon_ok2.sh b/xwords4/linux/scripts/discon_ok2.sh
index 4f598ec50..0b95ef55c 100755
--- a/xwords4/linux/scripts/discon_ok2.sh
+++ b/xwords4/linux/scripts/discon_ok2.sh
@@ -62,6 +62,7 @@ function cleanup() {
     fi
 
     echo "DELETE FROM games WHERE room LIKE 'ROOM_%';" | psql -q -t xwgames
+    echo "DELETE FROM msgs WHERE NOT devid in (SELECT unnest(devids) from games);" | psql -q -t xwgames
 }
 
 function connName() {