diff --git a/backend/docs/swagger.yaml b/backend/docs/swagger.yaml
index 0b773456..8db8bc6a 100644
--- a/backend/docs/swagger.yaml
+++ b/backend/docs/swagger.yaml
@@ -66,6 +66,7 @@ definitions:
           type: integer
         type: array
       limit:
+        minimum: 0
         type: integer
     type: object
   GenerateRequestInput:
diff --git a/clients/web/src/components/rooms/FilterTag.tsx b/clients/web/src/components/rooms/FilterTag.tsx
new file mode 100644
index 00000000..12e58291
--- /dev/null
+++ b/clients/web/src/components/rooms/FilterTag.tsx
@@ -0,0 +1,28 @@
+import { X } from "lucide-react";
+import { cn } from "@/lib/utils";
+
+type FilterTagProps = {
+  label: string;
+  onRemove: () => void;
+  className?: string;
+};
+
+export function FilterTag({ label, onRemove, className }: FilterTagProps) {
+  return (
+    <div
+      className={cn(
+        className,
+        "inline-flex items-center gap-1 rounded-md border border-stroke-default pl-4 pr-3 py-1.5 text-sm text-text-default transition-colors",
+      )}
+    >
+      {label}
+      <button
+        type="button"
+        onClick={onRemove}
+        className="text-text-subtle hover:text-text-default"
+      >
+        <X className="h-4 w-4" />
+      </button>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/rooms/OrderByDropdown.tsx b/clients/web/src/components/rooms/OrderByDropdown.tsx
new file mode 100644
index 00000000..ba5ef2ce
--- /dev/null
+++ b/clients/web/src/components/rooms/OrderByDropdown.tsx
@@ -0,0 +1,60 @@
+import { ChevronDown } from "lucide-react";
+import { useState } from "react";
+import { cn } from "@/lib/utils";
+
+type OrderByDropdownProps = {
+  ascending: boolean;
+  setAscending: (ascending: boolean) => void;
+};
+
+export function OrderByDropdown({
+  ascending,
+  setAscending,
+}: OrderByDropdownProps) {
+  const [open, setOpen] = useState(false);
+  const label = ascending ? "Ascending" : "Descending";
+
+  return (
+    <div
+      className="relative min-w-0 w-full max-w-31.5"
+      onBlur={(e) => {
+        if (!e.currentTarget.contains(e.relatedTarget)) setOpen(false);
+      }}
+    >
+      <button
+        type="button"
+        className={cn(
+          "flex w-full items-center justify-between gap-2 py-1 pl-2 pr-1 border border-stroke-subtle bg-bg-primary text-left",
+          open ? "rounded-t-md" : "rounded-md",
+        )}
+        onClick={() => setOpen((o) => !o)}
+        aria-expanded={open}
+      >
+        <span className="min-w-0 truncate text-md text-text-default">
+          {label}
+        </span>
+        <ChevronDown
+          className={cn(
+            "h-4 w-4 shrink-0 transition-transform",
+            open && "rotate-180",
+          )}
+        />
+      </button>
+
+      {open && (
+        <div className="absolute left-0 top-full z-10 w-full rounded-b-md border border-t-0 border-stroke-subtle bg-bg-primary shadow-md">
+          <button
+            type="button"
+            className="block w-full pl-2 pr-1 py-1 text-left text-md text-text-default hover:bg-bg-selected"
+            onClick={() => {
+              setAscending(!ascending);
+              setOpen(false);
+            }}
+          >
+            {ascending ? "Descending" : "Ascending"}
+          </button>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/clients/web/src/components/rooms/RoomsList.tsx b/clients/web/src/components/rooms/RoomsList.tsx
index 58777a41..cc3e335a 100644
--- a/clients/web/src/components/rooms/RoomsList.tsx
+++ b/clients/web/src/components/rooms/RoomsList.tsx
@@ -1,22 +1,41 @@
+import { useMemo } from "react";
 import type { RoomWithOptionalGuestBooking } from "@shared";
 import { RoomCard } from "@/components/rooms/RoomCard";
 
 type RoomsListProps = {
   rooms: Array<RoomWithOptionalGuestBooking>;
   onRoomSelect: (room: RoomWithOptionalGuestBooking) => void;
+  ascending: boolean;
   selectedRoomNumber?: number | null;
 };
 
+function sortRoomsByRoomNumber(
+  rooms: Array<RoomWithOptionalGuestBooking>,
+  ascending: boolean,
+): Array<RoomWithOptionalGuestBooking> {
+  return [...rooms].sort((a, b) => {
+    const an = a.room_number ?? 0;
+    const bn = b.room_number ?? 0;
+    return ascending ? an - bn : bn - an;
+  });
+}
+
 export function RoomsList({
   rooms,
   onRoomSelect,
+  ascending,
   selectedRoomNumber = null,
 }: RoomsListProps) {
+  const sortedRooms = useMemo(
+    () => sortRoomsByRoomNumber(rooms, ascending),
+    [rooms, ascending],
+  );
+
   return (
     <section className="flex-1 min-h-0 flex flex-col overflow-hidden py-4">
       <nav className="flex-1 min-h-0">
         <ul className="flex flex-col gap-4 h-full overflow-y-auto min-h-0 [&::-webkit-scrollbar]:hidden">
-          {rooms.map((room) => (
+          {sortedRooms.map((room) => (
             <li key={room.room_number} className="min-w-0">
               <RoomCard
                 room={room}
diff --git a/clients/web/src/components/rooms/SortByContainer.tsx b/clients/web/src/components/rooms/SortByContainer.tsx
new file mode 100644
index 00000000..ca2aa559
--- /dev/null
+++ b/clients/web/src/components/rooms/SortByContainer.tsx
@@ -0,0 +1,18 @@
+import { OrderByDropdown } from "./OrderByDropdown";
+
+type SortByContainerProps = {
+  ascending: boolean;
+  setAscending: (ascending: boolean) => void;
+};
+
+export function SortByContainer({
+  ascending,
+  setAscending,
+}: SortByContainerProps) {
+  return (
+    <span className="text-sm text-text-subtle flex items-center gap-1 pt-6">
+      Sort by:{" "}
+      <OrderByDropdown ascending={ascending} setAscending={setAscending} />
+    </span>
+  );
+}
diff --git a/clients/web/src/routes/_protected/rooms.index.tsx b/clients/web/src/routes/_protected/rooms.index.tsx
index c01cd22b..858748e0 100644
--- a/clients/web/src/routes/_protected/rooms.index.tsx
+++ b/clients/web/src/routes/_protected/rooms.index.tsx
@@ -3,6 +3,7 @@ import { useState } from "react";
 import { usePostRoomsHook } from "@shared/api/generated/endpoints/rooms/rooms";
 import { useQuery } from "@tanstack/react-query";
 import type { RoomWithOptionalGuestBooking } from "@shared";
+import { SortByContainer } from "@/components/rooms/SortByContainer";
 import { PageShell } from "@/components/ui/PageShell";
 import { RoomsHeader } from "@/components/rooms/RoomsHeader";
 import { RoomsList } from "@/components/rooms/RoomsList";
@@ -16,10 +17,11 @@ function RoomsPage() {
   const [selectedFloors, setSelectedFloors] = useState<Array<number>>([]);
   const [selectedRoom, setSelectedRoom] =
     useState<RoomWithOptionalGuestBooking | null>(null);
+  const [ascending, setAscending] = useState(true);
 
   const postRooms = usePostRoomsHook();
 
-  const { data } = useQuery({
+  const { data: rooms } = useQuery({
     queryKey: ["rooms", selectedFloors],
     queryFn: () =>
       postRooms({
@@ -44,8 +46,11 @@ function RoomsPage() {
         />
       }
     >
+      <SortByContainer ascending={ascending} setAscending={setAscending} />
+
       <RoomsList
-        rooms={data?.items ?? []}
+        rooms={rooms?.items ?? []}
+        ascending={ascending}
         onRoomSelect={setSelectedRoom}
         selectedRoomNumber={selectedRoom?.room_number ?? null}
       />
diff --git a/clients/web/src/styles.css b/clients/web/src/styles.css
index ddced12c..0e8713ad 100644
--- a/clients/web/src/styles.css
+++ b/clients/web/src/styles.css
@@ -48,6 +48,7 @@
   --color-shadow: #e7e7e7;
   --color-shadow-strong: #dcdcdc;
   --color-bg-container: #f8f8f8;
+  --color-bg-disabled: #bababa;
   --color-bg-primary: #ffffff;
   --color-bg-secondary: #5d5d5d;
   --color-bg-high-priority: #ffeded;