diff --git a/src/lib/services/berths.service.ts b/src/lib/services/berths.service.ts
index 80fb7fec..9ca18c85 100644
--- a/src/lib/services/berths.service.ts
+++ b/src/lib/services/berths.service.ts
@@ -67,7 +67,7 @@ export async function listBerths(portId: string, query: ListBerthsQuery) {
   // map. The mooring format is locked at `^[A-Z]+\d+$` so the regexp
   // splits are safe.
   const NATURAL_MOORING_SORT = [
-    sql`regexp_replace(${berths.mooringNumber}, '\d+$', '') ASC`,
+    sql`regexp_replace(${berths.mooringNumber}, '[0-9]+$', '') ASC`,
     sql`(regexp_replace(${berths.mooringNumber}, '^[A-Z]+', ''))::int ASC`,
   ];