diff --git a/clientapi/routing/admin.go b/clientapi/routing/admin.go
index 2893dbf88..622b8e1d1 100644
--- a/clientapi/routing/admin.go
+++ b/clientapi/routing/admin.go
@@ -1,6 +1,7 @@
 package routing
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 
@@ -104,7 +105,7 @@ func AdminPurgeRoom(req *http.Request, cfg *config.ClientAPI, device *userapi.De
 	}
 	res := &roomserverAPI.PerformAdminPurgeRoomResponse{}
 	if err := rsAPI.PerformAdminPurgeRoom(
-		req.Context(),
+		context.Background(),
 		&roomserverAPI.PerformAdminPurgeRoomRequest{
 			RoomID: roomID,
 		},
diff --git a/roomserver/internal/perform/perform_admin.go b/roomserver/internal/perform/perform_admin.go
index bf2157aaf..0f55b4c89 100644
--- a/roomserver/internal/perform/perform_admin.go
+++ b/roomserver/internal/perform/perform_admin.go
@@ -253,6 +253,7 @@ func (r *Admin) PerformAdminPurgeRoom(
 			Code: api.PerformErrorBadRequest,
 			Msg:  err.Error(),
 		}
+		return nil
 	} else {
 		logrus.WithField("room_id", req.RoomID).Warn("Room purged from roomserver")
 	}