diff --git a/roomserver/api/api_trace.go b/roomserver/api/api_trace.go
index 8f54799b2..ec7211ef8 100644
--- a/roomserver/api/api_trace.go
+++ b/roomserver/api/api_trace.go
@@ -73,7 +73,7 @@ func (t *RoomserverInternalAPITrace) PerformRoomUpgrade(
 	res *PerformRoomUpgradeResponse,
 ) {
 	t.Impl.PerformRoomUpgrade(ctx, req, res)
-	util.GetLogger(ctx).Infof("PerformUnpeek req=%+v res=%+v", js(req), js(res))
+	util.GetLogger(ctx).Infof("PerformRoomUpgrade req=%+v res=%+v", js(req), js(res))
 }
 
 func (t *RoomserverInternalAPITrace) PerformJoin(
diff --git a/roomserver/internal/perform/perform_upgrade.go b/roomserver/internal/perform/perform_upgrade.go
index 7c8a60cc4..042683755 100644
--- a/roomserver/internal/perform/perform_upgrade.go
+++ b/roomserver/internal/perform/perform_upgrade.go
@@ -300,7 +300,7 @@ func (r *Upgrader) userIsAuthorized(ctx context.Context, userID, roomID string,
 	if err != nil {
 		return false
 	}
-	// Check for power level required to send tombstone event (marks the curren room as obsolete),
+	// Check for power level required to send tombstone event (marks the current room as obsolete),
 	// if not found, use the StateDefault power level
 	plToUpgrade, ok := pl.Events["m.room.tombstone"]
 	if !ok {
@@ -384,9 +384,7 @@ func (r *Upgrader) generateInitialEvents(ctx context.Context, userID, roomID, ne
 		Content: newCreateContent,
 	}
 
-	membershipContent := gomatrixserverlib.MemberContent{
-		Membership: gomatrixserverlib.Join,
-	}
+	membershipContent := gomatrixserverlib.MemberContent{}
 	if err := json.Unmarshal(oldMembershipEvent.Content(), &membershipContent); err != nil {
 		util.GetLogger(ctx).WithError(err).Error()
 		return nil, &api.PerformError{