diff --git a/setup/config/config_roomserver.go b/setup/config/config_roomserver.go
index f47803f48..06e7757fb 100644
--- a/setup/config/config_roomserver.go
+++ b/setup/config/config_roomserver.go
@@ -16,8 +16,7 @@ type RoomServer struct {
 }
 
 func (c *RoomServer) Defaults(opts DefaultOpts) {
-	//c.DefaultRoomVersion = gomatrixserverlib.RoomVersionV10
-	c.DefaultRoomVersion = gomatrixserverlib.RoomVersionPseudoIDs
+	c.DefaultRoomVersion = gomatrixserverlib.RoomVersionV10
 	if opts.Generate {
 		if !opts.SingleDatabase {
 			c.Database.ConnectionString = "file:roomserver.db"