diff --git a/roomserver/internal/input/input_events.go b/roomserver/internal/input/input_events.go
index 26a97c877..682aa2b12 100644
--- a/roomserver/internal/input/input_events.go
+++ b/roomserver/internal/input/input_events.go
@@ -414,7 +414,7 @@ func (r *Inputer) processRoomEvent(
 	// Handle remote room upgrades, e.g. remove published room
 	if event.Type() == "m.room.tombstone" && event.StateKeyEquals("") && !r.Cfg.Matrix.IsLocalServerName(senderDomain) {
 		if err = r.handleRemoteRoomUpgrade(ctx, event); err != nil {
-			return fmt.Errorf("failed to handle remote room upgrade: %w")
+			return fmt.Errorf("failed to handle remote room upgrade: %w", err)
 		}
 	}
 
diff --git a/roomserver/storage/shared/storage.go b/roomserver/storage/shared/storage.go
index 734023d1f..2d14958cf 100644
--- a/roomserver/storage/shared/storage.go
+++ b/roomserver/storage/shared/storage.go
@@ -1406,7 +1406,7 @@ func (d *Database) UpgradeRoom(ctx context.Context, oldRoomID, newRoomID, eventS
 
 		for _, alias := range aliases {
 			if err = d.RoomAliasesTable.DeleteRoomAlias(ctx, txn, alias); err != nil {
-				fmt.Errorf("failed to remove room alias: %w", err)
+				return fmt.Errorf("failed to remove room alias: %w", err)
 			}
 			if err = d.RoomAliasesTable.InsertRoomAlias(ctx, txn, alias, newRoomID, eventSender); err != nil {
 				return fmt.Errorf("failed to set room alias: %w", err)