diff --git a/roomserver/alias/alias.go b/roomserver/alias/alias.go
index f4f5c20ce..73ed7bd29 100644
--- a/roomserver/alias/alias.go
+++ b/roomserver/alias/alias.go
@@ -25,6 +25,7 @@ import (
 	"github.com/matrix-org/dendrite/common"
 	"github.com/matrix-org/dendrite/common/config"
 	roomserverAPI "github.com/matrix-org/dendrite/roomserver/api"
+	"github.com/matrix-org/dendrite/roomserver/types"
 	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/matrix-org/util"
 )
@@ -46,6 +47,12 @@ type RoomserverAliasAPIDatabase interface {
 	// Remove a given room alias.
 	// Returns an error if there was a problem talking to the database.
 	RemoveRoomAlias(ctx context.Context, alias string) error
+	// Return the room NID for a room ID.
+	RoomNID(ctx context.Context, roomID string) (types.RoomNID, error)
+	// Look up the room version for a given room.
+	GetRoomVersionForRoom(
+		ctx context.Context, roomNID types.RoomNID,
+	) (gomatrixserverlib.RoomVersion, error)
 }
 
 // RoomserverAliasAPI is an implementation of alias.RoomserverAliasAPI
@@ -240,6 +247,16 @@ func (r *RoomserverAliasAPI) sendUpdatedAliasesEvent(
 	}
 	builder.AuthEvents = refs
 
+	roomNID, err := r.DB.RoomNID(ctx, roomID)
+	if err != nil {
+		return err
+	}
+
+	roomVersion, err := r.DB.GetRoomVersionForRoom(ctx, roomNID)
+	if err != nil {
+		return err
+	}
+
 	// Build the event
 	eventID := fmt.Sprintf("$%s:%s", util.RandomString(16), r.Cfg.Matrix.ServerName)
 	now := time.Now()
@@ -250,9 +267,6 @@ func (r *RoomserverAliasAPI) sendUpdatedAliasesEvent(
 		return err
 	}
 
-	// TODO: Room version here
-	roomVersion := gomatrixserverlib.RoomVersionV1
-
 	// Create the request
 	ire := roomserverAPI.InputRoomEvent{
 		Kind:         roomserverAPI.KindNew,
diff --git a/roomserver/alias/alias_test.go b/roomserver/alias/alias_test.go
index 6ddb63a73..8aeed136a 100644
--- a/roomserver/alias/alias_test.go
+++ b/roomserver/alias/alias_test.go
@@ -22,6 +22,8 @@ import (
 
 	appserviceAPI "github.com/matrix-org/dendrite/appservice/api"
 	roomserverAPI "github.com/matrix-org/dendrite/roomserver/api"
+	"github.com/matrix-org/dendrite/roomserver/types"
+	"github.com/matrix-org/gomatrixserverlib"
 )
 
 type MockRoomserverAliasAPIDatabase struct {
@@ -49,6 +51,18 @@ func (db *MockRoomserverAliasAPIDatabase) GetCreatorIDForAlias(
 	return "", nil
 }
 
+func (db *MockRoomserverAliasAPIDatabase) RoomNID(
+	ctx context.Context, roomID string,
+) (types.RoomNID, error) {
+	return 1, nil
+}
+
+func (db *MockRoomserverAliasAPIDatabase) GetRoomVersionForRoom(
+	ctx context.Context, roomNID types.RoomNID,
+) (gomatrixserverlib.RoomVersion, error) {
+	return gomatrixserverlib.RoomVersionV1, nil
+}
+
 // This method needs to change depending on test case
 func (db *MockRoomserverAliasAPIDatabase) GetRoomIDForAlias(
 	ctx context.Context,