diff --git a/.eslintrc b/.eslintrc
index c5fc56c99c..24a3a8fcad 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -81,6 +81,9 @@
                 "commonjs": false
             },
             "parserOptions": {
+                "parser": {
+                    "ts": "@typescript-eslint/parser"
+                },
                 "ecmaVersion": 2022,
                 "sourceType": "module"
             },
diff --git a/forge/db/controllers/Device.js b/forge/db/controllers/Device.js
index 3650fc23c1..e29c80035c 100644
--- a/forge/db/controllers/Device.js
+++ b/forge/db/controllers/Device.js
@@ -229,8 +229,9 @@ module.exports = {
         }
 
         if (paginationOptions.sort) {
+            // Prefer `dir`; fall back to legacy `order` query param if a caller still sends it.
             paginationOptions.order = {
-                [paginationOptions.sort]: paginationOptions.order
+                [paginationOptions.sort]: paginationOptions.dir || paginationOptions.order
             }
             delete paginationOptions.sort
             delete paginationOptions.dir
diff --git a/forge/db/controllers/Project.js b/forge/db/controllers/Project.js
index 89a3d15e0c..19ee3b8b23 100644
--- a/forge/db/controllers/Project.js
+++ b/forge/db/controllers/Project.js
@@ -22,6 +22,24 @@ module.exports = {
         app.caches.createCache(inflightDeploys)
     },
 
+    getProjectPaginationOptions: function (app, request) {
+        const { page, limit, sort, dir } = request.query || {}
+        const pagination = {}
+        if (typeof page === 'number') {
+            const pageSize = limit || 25
+            pagination.page = page
+            pagination.limit = pageSize
+            pagination.offset = (page - 1) * pageSize
+        } else if (limit) {
+            pagination.limit = limit
+        }
+        if (sort) {
+            pagination.sort = sort
+            pagination.dir = dir || 'asc'
+        }
+        return pagination
+    },
+
     /**
      * Get the in-flight state of a project
      * @param {*} app
diff --git a/forge/db/models/Device.js b/forge/db/models/Device.js
index d4cbff5d78..5de259477c 100644
--- a/forge/db/models/Device.js
+++ b/forge/db/models/Device.js
@@ -479,7 +479,13 @@ module.exports = {
                 } = {}) => {
                     // Pagination
                     const limit = Math.min(parseInt(pagination.limit) || 100, 100)
-                    if (pagination.cursor) {
+                    const pageNum = pagination.page ? parseInt(pagination.page) : null
+                    const usingOffset = pageNum && pageNum >= 1
+                    const offset = usingOffset ? (pageNum - 1) * limit : null
+                    if (usingOffset) {
+                        // Offset mode and cursor mode are mutually exclusive — drop any incoming cursor.
+                        delete pagination.cursor
+                    } else if (pagination.cursor) {
                         const cursors = pagination.cursor.split(',')
                         cursors[cursors.length - 1] = M.Device.decodeHashid(cursors[cursors.length - 1])
                         pagination.cursor = cursors.join(',')
@@ -535,6 +541,8 @@ module.exports = {
                                 }
                             } else if (key === 'instance') {
                                 order.unshift([M.Project, 'name', pagination.order[key] || 'ASC'])
+                            } else if (key === 'deviceGroup.name') {
+                                order.unshift([M.DeviceGroup, 'name', pagination.order[key] || 'ASC'])
                             } else if (key === 'state-priority') {
                                 order.unshift([literal(`
                                     CASE
@@ -627,18 +635,31 @@ module.exports = {
                     }
                     const statusOnlyIncludes = projectInclude.include?.where ? [projectInclude] : []
 
+                    const findAllOptions = {
+                        where: buildPaginationSearchClause(pagination, where, ['Device.name', 'Device.type'], {}, order),
+                        include: pagination.statusOnly ? statusOnlyIncludes : includes,
+                        order,
+                        limit: pagination.statusOnly ? null : limit
+                    }
+                    if (usingOffset && !pagination.statusOnly) {
+                        findAllOptions.offset = offset
+                    }
+                    // Mirror findAll's search/filter so total matches; strip cursor so we count the full match, not rows after it.
+                    const countWhere = buildPaginationSearchClause(
+                        { ...pagination, cursor: null },
+                        where,
+                        ['Device.name', 'Device.type'],
+                        {},
+                        order
+                    )
                     const [rows, count] = await Promise.all([
-                        this.findAll({
-                            where: buildPaginationSearchClause(pagination, where, ['Device.name', 'Device.type'], {}, order),
-                            include: pagination.statusOnly ? statusOnlyIncludes : includes,
-                            order,
-                            limit: pagination.statusOnly ? null : limit
-                        }),
-                        this.count({ where, include: statusOnlyIncludes })
+                        this.findAll(findAllOptions),
+                        this.count({ where: countWhere, include: statusOnlyIncludes })
                     ])
 
                     let nextCursors = []
-                    if (rows.length === limit && limit > 0) {
+                    // Cursor-based forward continuation only makes sense in cursor mode.
+                    if (!usingOffset && rows.length === limit && limit > 0) {
                         const lastRow = rows[rows.length - 1]
                         nextCursors = order.map((sortProps) => {
                             // Model, key, dir
@@ -666,10 +687,17 @@ module.exports = {
                         })
                     }
 
+                    const meta = {
+                        next_cursor: nextCursors.length > 0 ? nextCursors.join(',') : undefined
+                    }
+                    if (usingOffset) {
+                        meta.page = pageNum
+                        meta.pageSize = limit
+                        meta.total = count
+                        meta.pageCount = Math.max(1, Math.ceil(count / limit))
+                    }
                     return {
-                        meta: {
-                            next_cursor: nextCursors.length > 0 ? nextCursors.join(',') : undefined
-                        },
+                        meta,
                         count,
                         devices: rows
                     }
diff --git a/forge/db/models/Project.js b/forge/db/models/Project.js
index 425e6e1ba7..fc4817f0e0 100644
--- a/forge/db/models/Project.js
+++ b/forge/db/models/Project.js
@@ -552,15 +552,23 @@ module.exports = {
                     })
                 },
                 byTeam: async (teamIdOrHash, {
+                    pagination = null,
                     query = null,
                     instanceId = null,
                     includeAssociations = true,
                     includeSettings = false,
                     includeMeta = false,
-                    limit = null,
                     orderByMostRecentFlows = false,
                     excludeApplications = null
                 } = {}) => {
+                    const {
+                        page = null,
+                        limit = null,
+                        offset = null,
+                        sort = null,
+                        dir = 'asc'
+                    } = pagination || {}
+                    const withTotal = page !== null
                     let teamId = teamIdOrHash
                     if (typeof teamId === 'string') {
                         teamId = M.Team.decodeHashid(teamId)
@@ -613,8 +621,31 @@ module.exports = {
                     if (limit !== null) {
                         queryObject.limit = limit
                     }
+                    if (offset !== null) {
+                        queryObject.offset = offset
+                    }
 
-                    if (includeMeta && orderByMostRecentFlows) {
+                    const direction = String(dir).toLowerCase() === 'desc' ? 'DESC' : 'ASC'
+                    if (sort) {
+                        const sortMap = {
+                            name: ['name'],
+                            createdAt: ['createdAt'],
+                            updatedAt: ['updatedAt'],
+                            'application.name': [{ model: M.Application }, 'name'],
+                            flowLastUpdatedAt: [{ model: M.StorageFlow }, 'updatedAt']
+                        }
+                        const mapped = sortMap[sort]
+                        if (mapped) {
+                            // flowLastUpdatedAt needs the StorageFlow include — only valid with includeMeta
+                            if (sort === 'flowLastUpdatedAt' && !includeMeta) {
+                                // fall through to default ordering below
+                            } else {
+                                queryObject.order = [[...mapped, `${direction}${sort === 'flowLastUpdatedAt' ? ' NULLS LAST' : ''}`]]
+                            }
+                        }
+                    }
+
+                    if (!queryObject.order && includeMeta && orderByMostRecentFlows) {
                         queryObject.order = [
                             [literal(`
                                 CASE
@@ -647,6 +678,18 @@ module.exports = {
                         }
                     }
 
+                    if (withTotal) {
+                        const countInclude = [{
+                            model: M.Team,
+                            where: { id: teamId },
+                            attributes: []
+                        }]
+                        const [rows, total] = await Promise.all([
+                            this.findAll(queryObject),
+                            this.count({ where: queryObject.where, include: countInclude, distinct: true, col: 'id' })
+                        ])
+                        return { rows, total }
+                    }
                     return this.findAll(queryObject)
                 },
                 getProjectTeamId: async (id) => {
diff --git a/forge/routes/api-docs.js b/forge/routes/api-docs.js
index 818d7b24ec..ec6c9dfb63 100644
--- a/forge/routes/api-docs.js
+++ b/forge/routes/api-docs.js
@@ -150,7 +150,11 @@ module.exports = fp(async function (app, opts) {
         properties: {
             query: { type: 'string' },
             cursor: { type: 'string' },
-            limit: { type: 'number' }
+            limit: { type: 'number' },
+            page: { type: 'number', minimum: 1 },
+            sort: { type: 'string' },
+            dir: { type: 'string', enum: ['asc', 'desc'] },
+            order: { type: 'string', enum: ['asc', 'desc'] }
         }
     })
 
@@ -159,7 +163,11 @@ module.exports = fp(async function (app, opts) {
         type: 'object',
         properties: {
             next_cursor: { type: 'string' },
-            previous_cursor: { type: 'string' }
+            previous_cursor: { type: 'string' },
+            page: { type: 'number' },
+            pageSize: { type: 'number' },
+            total: { type: 'number' },
+            pageCount: { type: 'number' }
         }
     })
     app.addSchema({
diff --git a/forge/routes/api/projectDevices.js b/forge/routes/api/projectDevices.js
index d834f3489c..6f0357985e 100644
--- a/forge/routes/api/projectDevices.js
+++ b/forge/routes/api/projectDevices.js
@@ -21,6 +21,7 @@ module.exports = async function (app) {
         schema: {
             summary: 'Get a list of devices assigned to an instance',
             tags: ['Instances'],
+            query: { $ref: 'PaginationParams' },
             params: {
                 type: 'object',
                 properties: {
diff --git a/forge/routes/api/team.js b/forge/routes/api/team.js
index 5f0e4d0915..812b06f46b 100644
--- a/forge/routes/api/team.js
+++ b/forge/routes/api/team.js
@@ -365,30 +365,32 @@ module.exports = async function (app) {
      */
     app.get('/:teamId/projects', {
         preHandler: app.needsPermission('team:projects:list'),
-        query: {
-            type: 'object',
-            properties: {
-                limit: {
-                    type: 'number',
-                    nullable: true
-                },
-                includeMeta: {
-                    type: 'boolean',
-                    nullable: true,
-                    default: false
-                },
-                orderByMostRecentFlows: {
-                    type: 'boolean',
-                    nullable: true,
-                    default: false
-                }
+        schema: {
+            query: {
+                allOf: [
+                    { $ref: 'PaginationParams' },
+                    {
+                        type: 'object',
+                        properties: {
+                            sort: {
+                                type: 'string',
+                                enum: ['name', 'createdAt', 'updatedAt', 'application.name', 'flowLastUpdatedAt']
+                            },
+                            includeMeta: { type: 'boolean', default: false },
+                            orderByMostRecentFlows: { type: 'boolean', default: false }
+                        }
+                    }
+                ]
             }
         }
     }, async (request, reply) => {
         const includeMeta = request.query.includeMeta
+        const pagination = app.db.controllers.Project.getProjectPaginationOptions(request)
+
         const options = {
             includeSettings: true,
-            limit: request.query.limit,
+            pagination,
+            query: request.query.query?.trim() || null,
             includeMeta,
             orderByMostRecentFlows: request.query.orderByMostRecentFlows
         }
@@ -406,7 +408,10 @@ module.exports = async function (app) {
             }
         }
 
-        const projects = await app.db.models.Project.byTeam(request.params.teamId, options)
+        const queryResult = await app.db.models.Project.byTeam(request.params.teamId, options)
+        const paginated = pagination.page != null
+        const projects = paginated ? queryResult.rows : queryResult
+        const total = paginated ? queryResult.total : null
 
         if (projects) {
             let result = await app.db.views.Project.instancesList(projects, {
@@ -420,10 +425,19 @@ module.exports = async function (app) {
                     return { id: e.id, name: e.name }
                 })
             }
-            reply.send({
-                count: result.length,
+            const response = {
+                count: paginated ? total : result.length,
                 projects: result
-            })
+            }
+            if (paginated) {
+                response.meta = {
+                    page: pagination.page,
+                    pageSize: pagination.limit,
+                    total,
+                    pageCount: Math.max(1, Math.ceil(total / pagination.limit))
+                }
+            }
+            reply.send(response)
         } else {
             reply.code(404).send({ code: 'not_found', error: 'Not Found' })
         }
diff --git a/forge/routes/api/teamDevices.js b/forge/routes/api/teamDevices.js
index 6f405e66ce..41b5341901 100644
--- a/forge/routes/api/teamDevices.js
+++ b/forge/routes/api/teamDevices.js
@@ -95,7 +95,6 @@ module.exports = async function (app) {
         }
         const devices = await app.db.models.Device.getAll(paginationOptions, where, options)
         devices.devices = devices.devices.map(d => app.db.views.Device.device(d, { statusOnly: paginationOptions.statusOnly }))
-        devices.count = devices.devices.length
         reply.send(devices)
     })
 
diff --git a/frontend/src/api/team.js b/frontend/src/api/team.js
index 362d649a83..fb798aa777 100644
--- a/frontend/src/api/team.js
+++ b/frontend/src/api/team.js
@@ -196,19 +196,39 @@ const getTeamInstancesList = async (teamId) => {
 }
 
 const getInstances = async (teamId, {
-    limit = 20,
+    pagination = null,
     includeMeta = false,
     orderByMostRecentFlows = false
 } = {}) => {
+    const {
+        page = null,
+        limit = 20,
+        query = null,
+        sort = null,
+        dir = null
+    } = pagination || {}
     const params = new URLSearchParams()
 
     params.append('limit', limit.toString())
 
+    if (page !== null) params.append('page', String(page))
+    if (query) params.append('query', query)
+    if (sort) params.append('sort', sort)
+    if (dir) params.append('dir', dir)
     if (includeMeta) params.append('includeMeta', includeMeta.toString())
     if (orderByMostRecentFlows) params.append('orderByMostRecentFlows', orderByMostRecentFlows.toString())
 
-    return await client.get(`/api/v1/teams/${teamId}/projects?${params.toString()}`)
-        .then(res => res.data)
+    const res = await client.get(`/api/v1/teams/${teamId}/projects?${params.toString()}`)
+    res.data.projects = res.data.projects.map(r => {
+        if (r.flowLastUpdatedAt) {
+            r.flowLastUpdatedSince = daysSince(r.flowLastUpdatedAt)
+        }
+        if (r.meta?.state) {
+            r.status = r.meta.state
+        }
+        return r
+    })
+    return res.data
 }
 
 const getTeamMembers = (teamId) => {
diff --git a/frontend/src/components/DevicesBrowser.vue b/frontend/src/components/DevicesBrowser.vue
index 1b97a701db..24f8883cf0 100644
--- a/frontend/src/components/DevicesBrowser.vue
+++ b/frontend/src/components/DevicesBrowser.vue
@@ -20,13 +20,14 @@
                 :rows="devicesWithStatuses"
                 :show-search="true"
                 search-placeholder="Search Remote Instances"
-                :show-load-more="moreThanOnePage"
+                :pagination="paginationProps"
                 :check-key="row => row.id"
                 :show-row-checkboxes="hasPermission('team:device:bulk-edit', applicationContext)"
                 @rows-checked="checkedDevices = $event"
-                @load-more="loadMoreDevices"
                 @update:search="updateSearch"
                 @update:sort="updateSort"
+                @update:page="onPageChange"
+                @update:page-size="onPageSizeChange"
             >
                 <template #actions>
                     <ff-popover button-text="Filters" button-kind="secondary">
@@ -445,8 +446,11 @@ export default {
 
             checkedDevices: [], // devices currently selected in the table
 
-            unsearchedHasMoreThanOnePage: true,
-            unfilteredHasMoreThanOnePage: true,
+            // Pagination
+            page: 1,
+            pageSize: 25,
+            totalRows: 0,
+            searchTerm: '',
 
             sort: {
                 key: null,
@@ -468,10 +472,10 @@ export default {
         ...mapState(useUxToursStore, ['tours']),
         columns () {
             const columns = [
-                { label: 'Remote Instance', key: 'name', sortable: !this.moreThanOnePage, component: { is: markRaw(DeviceLink) } },
-                { label: 'Type', key: 'type', class: ['w-48'], sortable: !this.moreThanOnePage },
-                { label: 'Created', key: 'createdAt', class: ['w-48'], sortable: !this.moreThanOnePage, component: { is: markRaw(DeviceCreatedAtCell) } },
-                { label: 'Last Seen', key: 'lastSeenAt', class: ['w-48'], sortable: !this.moreThanOnePage, component: { is: markRaw(DeviceLastSeenCell) } },
+                { label: 'Remote Instance', key: 'name', sortable: true, component: { is: markRaw(DeviceLink) } },
+                { label: 'Type', key: 'type', class: ['w-48'], sortable: true },
+                { label: 'Created', key: 'createdAt', class: ['w-48'], sortable: true, component: { is: markRaw(DeviceCreatedAtCell) } },
+                { label: 'Last Seen', key: 'lastSeenAt', class: ['w-48'], sortable: true, component: { is: markRaw(DeviceLastSeenCell) } },
                 { label: 'Mode', key: 'mode', class: ['w-30'], sortable: true, component: { is: markRaw(DeviceModeBadge) } },
                 { label: 'Last Known Status', class: ['w-32'], component: { is: markRaw(InstanceStatusBadge), map: { instanceId: 'id' }, extraProps: { instanceType: 'device' } } }
             ]
@@ -482,7 +486,6 @@ export default {
                     label: 'Assigned To',
                     class: ['w-48'],
                     key: '_ownerSortKey',
-                    sortable: !this.moreThanOnePage,
                     component: {
                         is: markRaw(DeviceAssignedToLink)
                     }
@@ -491,7 +494,7 @@ export default {
                     columns.push({
                         label: 'Group',
                         key: 'deviceGroup.name',
-                        sortable: !this.moreThanOnePage
+                        sortable: true
                     })
                 }
             } else if (this.displayingInstance) {
@@ -503,25 +506,14 @@ export default {
                 columns.push({
                     label: 'Group',
                     key: 'deviceGroup.name',
-                    sortable: !this.moreThanOnePage
+                    sortable: true
                 })
             }
 
             return columns
         },
-        filteredDevices () {
-            const devicesToDisplay = new Set(this.filter?.devices)
-
-            return Array.from(this.devices.values()).filter((device) => {
-                if (!this.filter || this.unfilteredHasMoreThanOnePage) {
-                    return true
-                }
-
-                return devicesToDisplay.has(device.id)
-            })
-        },
         devicesWithStatuses () {
-            const output = this.filteredDevices.map(device => {
+            const output = Array.from(this.devices.values()).map(device => {
                 const statusObject = this.allDeviceStatuses.get(device.id)
                 const ownerKey = this.getOwnerSortKeyForDevice(device)
                 const context = device.application?.id ? { applicationId: device.application?.id } : {}
@@ -544,7 +536,14 @@ export default {
             )
         },
         moreThanOnePage () {
-            return !!this.nextCursor
+            return this.totalRows > this.pageSize
+        },
+        paginationProps () {
+            return {
+                page: this.page,
+                pageSize: this.pageSize,
+                total: this.totalRows
+            }
         },
         teamRuntimeLimitReached () {
             let teamTypeRuntimeLimit = getTeamProperty(this.team, 'runtimes.limit')
@@ -638,10 +637,8 @@ export default {
          */
         applyFilter (filter, shouldClearDeviceModeFilters = true) {
             this.filter = filter
-
-            if (this.unfilteredHasMoreThanOnePage) {
-                this.doFilterServerSide()
-            }
+            this.page = 1
+            this.doFilterServerSide()
 
             if (shouldClearDeviceModeFilters) {
                 this.deviceModeFilters = {
@@ -653,19 +650,26 @@ export default {
 
         updateSearch (searchTerm) {
             this.searchTerm = searchTerm
-
-            if (this.unsearchedHasMoreThanOnePage) {
-                this.doSearchServerSide()
-            }
+            this.page = 1
+            this.doSearchServerSide()
         },
 
         updateSort (key, direction) {
             this.sort.key = key
             this.sort.direction = direction
+            this.page = 1
+            this.doSortServerSide()
+        },
 
-            if (this.moreThanOnePage) {
-                this.doSortServerSide()
-            }
+        onPageChange (page) {
+            this.page = page
+            this.loadDevices(true)
+        },
+
+        onPageSizeChange (pageSize) {
+            this.pageSize = pageSize
+            this.page = 1
+            this.loadDevices(true)
         },
 
         doFilterServerSide: debounce(function () {
@@ -853,6 +857,7 @@ export default {
         // Device loading
         fullReloadOfData () {
             this.checkedDevices = []
+            this.page = 1
             this.loadDevices(true)
             this.pollForDeviceStatuses(true)
         },
@@ -863,24 +868,17 @@ export default {
             }
         },
 
-        async loadMoreDevices () {
-            await this.fetchDevices()
-        },
-
         async pollForDeviceStatuses (reset) {
             if (this.hasLoadedModel) {
                 await this.fetchAllDeviceStatuses(reset)
             }
         },
 
-        async fetchDevices (resetPage = false) {
-            if (resetPage) {
-                this.nextCursor = null
-            }
-
+        async fetchDevices () {
             /// Params to send to the server
-            const nextCursor = this.nextCursor
-            const extraParams = {}
+            const extraParams = {
+                page: this.page
+            }
 
             // Specific filtering
             if (this.filter?.property && this.filter?.bucket) {
@@ -898,27 +896,16 @@ export default {
                 }
             }
 
-            // Actually fetch the data
-            const data = await this.fetchData(nextCursor, null, extraParams)
-
-            if (resetPage) {
-                this.devices = new Map()
-            }
+            const data = await this.fetchData(this.pageSize, extraParams)
 
+            const nextDevices = new Map()
             data.devices.forEach(device => {
-                this.devices.set(device.id, device)
+                nextDevices.set(device.id, device)
             })
+            this.devices = nextDevices
 
-            // Pagination
-            this.nextCursor = data.meta?.next_cursor || null
-
-            if (!extraParams.query) {
-                this.unsearchedHasMoreThanOnePage = this.moreThanOnePage
-            }
-
-            if (!extraParams.filters) {
-                this.unfilteredHasMoreThanOnePage = this.moreThanOnePage
-            }
+            // Pagination — prefer the new meta.total field, fall back to count for safety.
+            this.totalRows = data.meta?.total ?? data.count ?? data.devices.length
 
             this.loadingDevices = false
         },
diff --git a/frontend/src/mixins/DeviceActions.js b/frontend/src/mixins/DeviceActions.js
index d427f963cf..42c141a171 100644
--- a/frontend/src/mixins/DeviceActions.js
+++ b/frontend/src/mixins/DeviceActions.js
@@ -67,6 +67,9 @@ export default {
                         Alerts.emit('Successfully deleted the device', 'confirmation')
                         this.deleteLocalCopyOfDevice(device)
                         this.$emit('delete-device')
+                        if (typeof this.loadDevices === 'function') {
+                            this.loadDevices(true)
+                        }
                     } catch (err) {
                         Alerts.emit('Failed to delete device: ' + err.toString(), 'warning', 7500)
                     }
@@ -207,18 +210,18 @@ export default {
         },
 
         // Actual fetching methods
-        async fetchData (nextCursor = null, limit = null, extraParams = { statusOnly: false }) {
+        async fetchData (limit = null, extraParams = { statusOnly: false }) {
             const query = null // handled via extraParams
             if (this.displayingInstance) {
-                return await instanceApi.getInstanceDevices(this.instance.id, nextCursor, limit, query, extraParams)
+                return await instanceApi.getInstanceDevices(this.instance.id, null, limit, query, extraParams)
             }
 
             if (this.displayingApplication) {
-                return await ApplicationApi.getApplicationDevices(this.application.id, nextCursor, limit, query, extraParams)
+                return await ApplicationApi.getApplicationDevices(this.application.id, null, limit, query, extraParams)
             }
 
             if (this.displayingTeam) {
-                return await teamApi.getTeamDevices(this.team.id, nextCursor, limit, query, extraParams)
+                return await teamApi.getTeamDevices(this.team.id, null, limit, query, extraParams)
             }
 
             console.warn('Trying to fetch data without a loaded model.')
@@ -227,7 +230,7 @@ export default {
         },
 
         async fetchAllDeviceStatuses (reset = false) {
-            const data = await this.fetchData(null, null, { statusOnly: true })
+            const data = await this.fetchData(null, { statusOnly: true })
 
             if (reset) {
                 this.allDeviceStatuses = new Map()
diff --git a/frontend/src/pages/team/Home/components/RecentlyModifiedInstances.vue b/frontend/src/pages/team/Home/components/RecentlyModifiedInstances.vue
index 486d4a1a33..7005c7d6df 100644
--- a/frontend/src/pages/team/Home/components/RecentlyModifiedInstances.vue
+++ b/frontend/src/pages/team/Home/components/RecentlyModifiedInstances.vue
@@ -78,7 +78,7 @@ export default {
                 this.hasMore = true
             }
             return teamAPI.getInstances(this.team.id, {
-                limit,
+                pagination: { limit },
                 includeMeta: true,
                 orderByMostRecentFlows: true
             })
diff --git a/frontend/src/pages/team/Instances.vue b/frontend/src/pages/team/Instances.vue
index bba6c4ff58..82cd2dadea 100644
--- a/frontend/src/pages/team/Instances.vue
+++ b/frontend/src/pages/team/Instances.vue
@@ -32,15 +32,20 @@
             <div class="banner-wrapper">
                 <FeatureUnavailableToTeam v-if="!instancesAvailable" />
             </div>
-            <ff-loading v-if="loading" message="Loading Instances..." />
+            <ff-loading v-if="loading && !instancesMap.size" message="Loading Instances..." />
             <template v-else-if="instancesAvailable">
                 <ff-data-table
-                    v-if="instances.length > 0"
+                    v-if="instances.length > 0 || searchTerm"
                     data-el="instances-table" :columns="columns" :rows="instances" :show-search="true"
                     search-placeholder="Search Instances..."
-                    initialSortKey="flowLastUpdatedAt" initialSortOrder="desc"
+                    :initialSortKey="sort.key" :initialSortOrder="sort.order"
                     :rows-selectable="!dashboardRoleOnly"
+                    :pagination="paginationProps"
                     @row-selected="openInstance"
+                    @update:search="updateSearch"
+                    @update:sort="updateSort"
+                    @update:page="onPageChange"
+                    @update:page-size="onPageSizeChange"
                 >
                     <template #actions>
                         <ff-button
@@ -57,11 +62,11 @@
                         </ff-button>
                     </template>
                     <template #row-actions="{row}">
-                        <dashboard-link v-if="!!row.settings?.dashboard2UI?.length" :disabled="row.meta?.state !== 'running'" :instance="row" />
+                        <dashboard-link v-if="!!row.settings?.dashboard2UI?.length" :disabled="row.status !== 'running'" :instance="row" />
                         <instance-editor-link
                             v-if="hasPermission('team:projects:list')"
                             :instance="row"
-                            :disabled="row.meta?.state !== 'running'"
+                            :disabled="row.status !== 'running'"
                             disabled-reason="The Instance is not running"
                         />
                     </template>
@@ -161,7 +166,6 @@ import { PlusSmallIcon } from '@heroicons/vue/24/outline'
 import { mapState } from 'pinia'
 import { markRaw } from 'vue'
 
-import instanceApi from '../../api/instances.js'
 import teamApi from '../../api/team.js'
 import EmptyState from '../../components/EmptyState.vue'
 import InstanceStatusPolling from '../../components/InstanceStatusPolling.vue'
@@ -170,7 +174,9 @@ import { useInstanceStates } from '../../composables/InstanceStates.js'
 import { useNavigationHelper } from '../../composables/NavigationHelper.js'
 import usePermissions from '../../composables/Permissions.js'
 import instanceActionsMixin from '../../mixins/InstanceActions.js'
+import Alerts from '../../services/alerts.js'
 import { InstanceStateMutator } from '../../utils/InstanceStateMutator.js'
+import { debounce } from '../../utils/eventHandling.js'
 import ApplicationLink from '../application/components/cells/ApplicationLink.vue'
 import DeploymentName from '../application/components/cells/DeploymentName.vue'
 import SimpleTextCell from '../application/components/cells/SimpleTextCell.vue'
@@ -212,19 +218,26 @@ export default {
         return {
             loading: false,
             instancesMap: new Map(),
+            page: 1,
+            pageSize: 25,
+            totalRows: 0,
+            searchTerm: '',
+            sort: {
+                key: 'flowLastUpdatedAt',
+                order: 'desc'
+            },
             columns: [
                 { label: 'Name', class: ['grow'], key: 'name', sortable: true, component: { is: markRaw(DeploymentName), map: { url: 'url' }, extraProps: { copyable: true } } },
                 {
                     label: 'Status',
                     class: ['w-44'],
-                    sortable: true,
                     component: {
                         is: markRaw(InstanceStatusBadge),
                         map: {
                             instanceId: 'id',
                             pendingStateChange: 'pendingStateChange',
                             optimisticStateChange: 'optimisticStateChange',
-                            status: 'meta.state'
+                            status: 'status'
                         },
                         extraProps: {
                             instanceType: 'instance'
@@ -265,64 +278,89 @@ export default {
         },
         instancesAvailable () {
             return this.featuresCheck?.isHostedInstancesEnabledForTeam
+        },
+        paginationProps () {
+            if (this.dashboardRoleOnly) return null
+            return {
+                page: this.page,
+                pageSize: this.pageSize,
+                total: this.totalRows
+            }
         }
     },
     watch: {
-        team: 'fetchData'
+        team: 'fullReload'
     },
     mounted () {
-        this.fetchData()
+        this.fullReload()
     },
     methods: {
-        fetchData: async function () {
+        fullReload () {
+            this.page = 1
+            this.fetchData()
+        },
+        async fetchData () {
+            if (!this.team.id || !this.instancesAvailable) {
+                this.loading = false
+                return
+            }
             this.loading = true
-            let promise
-            if (this.team.id && this.instancesAvailable) {
+            try {
+                let response
                 if (this.hasPermission('team:projects:list')) {
-                    promise = teamApi.getTeamInstances(this.team.id)
+                    response = await teamApi.getInstances(this.team.id, {
+                        pagination: {
+                            page: this.page,
+                            limit: this.pageSize,
+                            query: this.searchTerm || null,
+                            sort: this.sort.key || null,
+                            dir: this.sort.order || null
+                        },
+                        includeMeta: true
+                    })
                 } else if (this.hasPermission('team:read')) {
-                    promise = teamApi.getTeamDashboards(this.team.id)
+                    // Dashboards endpoint not paginated server-side; keep current behavior.
+                    response = await teamApi.getTeamDashboards(this.team.id)
                 }
-
-                promise.then(response => response.projects)
-                    .then((projects) => {
-                        projects.forEach(instance => {
-                            instance.running = this.isRunningState(instance.status)
-                            instance.notSuspended = instance.status !== 'suspended'
-                            instance.pendingStateChange = false
-                            instance.optimisticStateChange = false
-                            instance.canDelete = this.hasPermission('project:delete', { application: instance.application })
-                            instance.canChangeStatus = this.hasPermission('project:change-status', { application: instance.application })
-                            instance.hideContextMenu = !(instance.canDelete || instance.canChangeStatus)
-                            this.instancesMap.set(instance.id, instance)
-                        })
-                    })
-                    .then(() => this.getInstanceMeta())
-                    .catch(e => e)
-                    .finally(() => {
-                        this.loading = false
-                    })
-
-                this.getInstanceMeta()
-            } else {
+                const projects = response?.projects || []
+                this.totalRows = response?.meta?.total ?? response?.count ?? projects.length
+                const nextMap = new Map()
+                projects.forEach(instance => {
+                    instance.running = this.isRunningState(instance.meta?.state || instance.status)
+                    instance.notSuspended = (instance.meta?.state || instance.status) !== 'suspended'
+                    instance.pendingStateChange = false
+                    instance.optimisticStateChange = false
+                    instance.canDelete = this.hasPermission('project:delete', { application: instance.application })
+                    instance.canChangeStatus = this.hasPermission('project:change-status', { application: instance.application })
+                    instance.hideContextMenu = !(instance.canDelete || instance.canChangeStatus)
+                    nextMap.set(instance.id, instance)
+                })
+                this.instancesMap = nextMap
+            } catch (e) {
+                Alerts.emit('Failed to load instances.', 'warning')
+            } finally {
                 this.loading = false
             }
         },
-        getInstanceMeta () {
-            const promises = []
-            this.instances.forEach(i => {
-                promises.push(instanceApi.getStatus(i.id)
-                    .then(res => {
-                        if (this.instancesMap.has(res.id)) {
-                            res.running = this.isRunningState(res.meta.state)
-                            res.notSuspended = res.meta.state !== 'suspended'
-                            this.instancesMap.set(res.id, {
-                                ...this.instancesMap.get(res.id),
-                                ...res
-                            })
-                        }
-                    }))
-            })
+        updateSearch: debounce(function (term) {
+            this.searchTerm = term
+            this.page = 1
+            this.fetchData()
+        }, 200),
+        updateSort (key, order) {
+            this.sort.key = key
+            this.sort.order = order
+            this.page = 1
+            this.fetchData()
+        },
+        onPageChange (page) {
+            this.page = page
+            this.fetchData()
+        },
+        onPageSizeChange (pageSize) {
+            this.pageSize = pageSize
+            this.page = 1
+            this.fetchData()
         },
         openInstance (instance, event) {
             this.navigateTo({
@@ -345,6 +383,8 @@ export default {
         onInstanceDeleted (instance) {
             if (this.instancesMap.has(instance.id)) {
                 this.instancesMap.delete(instance.id)
+                // Refetch to refresh totals and pull in any backfill row from the next page.
+                this.fetchData()
             }
         }
     }
diff --git a/frontend/src/types/generated.ts b/frontend/src/types/generated.ts
index 042832776f..098f988c37 100644
--- a/frontend/src/types/generated.ts
+++ b/frontend/src/types/generated.ts
@@ -279,6 +279,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                     event?: string | string[];
                     username?: string;
                 };
@@ -334,6 +338,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                     event?: string | string[];
                     username?: string;
                 };
@@ -1337,6 +1345,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                 };
                 header?: never;
                 path?: never;
@@ -1822,6 +1834,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                 };
                 header?: never;
                 path?: never;
@@ -2072,6 +2088,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                     event?: string | string[];
                     username?: string;
                 };
@@ -2134,6 +2154,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                     event?: string | string[];
                     username?: string;
                 };
@@ -2498,6 +2522,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                 };
                 header?: never;
                 path: {
@@ -2554,6 +2582,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                 };
                 header?: never;
                 path: {
@@ -2834,6 +2866,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                 };
                 header?: never;
                 path?: never;
@@ -3291,6 +3327,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                 };
                 header?: never;
                 path: {
@@ -3447,6 +3487,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                     event?: string | string[];
                     username?: string;
                 };
@@ -3509,6 +3553,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                     event?: string | string[];
                     username?: string;
                 };
@@ -3814,6 +3862,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                 };
                 header?: never;
                 path: {
@@ -3882,6 +3934,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                     event?: string | string[];
                     username?: string;
                 };
@@ -3944,6 +4000,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                     event?: string | string[];
                     username?: string;
                 };
@@ -4218,7 +4278,15 @@ export interface paths {
         /** Get a list of devices assigned to an instance */
         get: {
             parameters: {
-                query?: never;
+                query?: {
+                    query?: string;
+                    cursor?: string;
+                    limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
+                };
                 header?: never;
                 path: {
                     instanceId: string;
@@ -4936,6 +5004,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                     filter?: string;
                 };
                 header?: never;
@@ -5149,6 +5221,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                 };
                 header?: never;
                 path?: never;
@@ -5360,6 +5436,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                 };
                 header?: never;
                 path?: never;
@@ -5948,6 +6028,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                     event?: string | string[];
                     username?: string;
                 };
@@ -6004,6 +6088,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                     event?: string | string[];
                     username?: string;
                 };
@@ -6338,6 +6426,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                     filter?: string;
                 };
                 header?: never;
@@ -7539,6 +7631,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                 };
                 header?: never;
                 path?: never;
@@ -7844,6 +7940,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                 };
                 header?: never;
                 path: {
@@ -8153,6 +8253,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                 };
                 header?: never;
                 path: {
@@ -8313,6 +8417,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                 };
                 header?: never;
                 path: {
@@ -9487,6 +9595,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                 };
                 header?: never;
                 path: {
@@ -9697,6 +9809,10 @@ export interface paths {
                     query?: string;
                     cursor?: string;
                     limit?: number;
+                    page?: number;
+                    sort?: string;
+                    dir?: "asc" | "desc";
+                    order?: "asc" | "desc";
                 };
                 header?: never;
                 path: {
@@ -10717,11 +10833,21 @@ export interface components {
             query?: string;
             cursor?: string;
             limit?: number;
+            page?: number;
+            sort?: string;
+            /** @enum {string} */
+            dir?: "asc" | "desc";
+            /** @enum {string} */
+            order?: "asc" | "desc";
         };
         /** PaginationMeta */
         PaginationMeta: {
             next_cursor?: string;
             previous_cursor?: string;
+            page?: number;
+            pageSize?: number;
+            total?: number;
+            pageCount?: number;
         };
         /** LinksMeta */
         LinksMeta: {
diff --git a/frontend/src/ui-components/components.js b/frontend/src/ui-components/components.js
index ee260efed6..2fa345f0f7 100644
--- a/frontend/src/ui-components/components.js
+++ b/frontend/src/ui-components/components.js
@@ -14,6 +14,7 @@ import FFSpinner from './components/Spinner.vue'
 import FFDataTable from './components/data-table/DataTable.vue'
 import FFDataTableCell from './components/data-table/DataTableCell.vue'
 import FFDataTableRow from './components/data-table/DataTableRow.vue'
+import FFPagination from './components/data-table/Pagination.vue'
 
 // Form Elements
 import FFCheckbox from './components/form/Checkbox.vue'
@@ -53,6 +54,7 @@ export default {
     FFDataTable,
     FFDataTableRow,
     FFDataTableCell,
+    FFPagination,
     // Form Elements
     FFTextInput,
     FFDropdown,
diff --git a/frontend/src/ui-components/components/data-table/DataTable.vue b/frontend/src/ui-components/components/data-table/DataTable.vue
index c90c2eeee6..22fa4f4b59 100644
--- a/frontend/src/ui-components/components/data-table/DataTable.vue
+++ b/frontend/src/ui-components/components/data-table/DataTable.vue
@@ -120,6 +120,15 @@
         <div v-if="showLoadMore" class="ff-loadmore">
             <span data-action="load-more" @click="$emit('load-more')">Load More...</span>
         </div>
+        <ff-pagination
+            v-if="pagination"
+            :page="pagination.page"
+            :page-size="pagination.pageSize"
+            :total="pagination.total"
+            :page-size-options="pagination.pageSizeOptions || [10, 25, 50, 100]"
+            @update:page="$emit('update:page', $event)"
+            @update:page-size="$emit('update:page-size', $event)"
+        />
     </div>
 </template>
 
@@ -276,9 +285,13 @@ export default {
         collapsibleRow: {
             type: Object,
             default: null
+        },
+        pagination: {
+            type: Object,
+            default: null
         }
     },
-    emits: ['update:search', 'load-more', 'row-selected', 'update:sort', 'rows-checked'],
+    emits: ['update:search', 'load-more', 'row-selected', 'update:sort', 'rows-checked', 'update:page', 'update:page-size'],
     setup () {
         return { slugify }
     },
diff --git a/frontend/src/ui-components/components/data-table/Pagination.vue b/frontend/src/ui-components/components/data-table/Pagination.vue
new file mode 100644
index 0000000000..6dca99946c
--- /dev/null
+++ b/frontend/src/ui-components/components/data-table/Pagination.vue
@@ -0,0 +1,114 @@
+<template>
+    <div v-if="total > pageSize" class="ff-pagination" data-el="pagination">
+        <div class="ff-pagination--page-size">
+            <label>Rows per page:</label>
+            <ff-listbox
+                v-model="pageSizeModel"
+                :options="pageSizeListboxOptions"
+                :min-width="64"
+                :options-min-width="64"
+                data-form="page-size"
+            />
+        </div>
+        <div class="ff-pagination--summary">{{ summary }}</div>
+        <nav class="ff-pagination--pages" aria-label="Pagination">
+            <ff-button
+                kind="tertiary"
+                size="small"
+                :disabled="props.page <= 1"
+                title="Previous page"
+                data-action="page-prev"
+                @click="goTo(props.page - 1)"
+            >
+                <template #icon><ChevronLeftIcon /></template>
+            </ff-button>
+            <template v-for="(p, idx) in pageItems" :key="idx">
+                <span v-if="p === '...'" class="ff-pagination--ellipsis">…</span>
+                <ff-button
+                    v-else
+                    :kind="p === props.page ? 'primary' : 'tertiary'"
+                    size="small"
+                    :data-action="'page-' + p"
+                    @click="goTo(p)"
+                >
+                    {{ p }}
+                </ff-button>
+            </template>
+            <ff-button
+                kind="tertiary"
+                size="small"
+                :disabled="props.page >= pageCount"
+                title="Next page"
+                data-action="page-next"
+                @click="goTo(props.page + 1)"
+            >
+                <template #icon><ChevronRightIcon /></template>
+            </ff-button>
+        </nav>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ChevronLeftIcon, ChevronRightIcon } from '@heroicons/vue/20/solid'
+import { computed } from 'vue'
+
+defineOptions({ name: 'ff-pagination' })
+
+const props = withDefaults(defineProps<{
+    page?: number
+    pageSize?: number
+    total?: number
+    pageSizeOptions?: number[]
+}>(), {
+    page: 1,
+    pageSize: 25,
+    total: 0,
+    pageSizeOptions: () => [10, 25, 50, 100]
+})
+
+const emit = defineEmits(['update:page', 'update:pageSize'])
+
+const pageCount = computed(() => Math.max(1, Math.ceil(props.total / props.pageSize)))
+
+const summary = computed(() => {
+    if (props.total === 0) return '0 of 0'
+    const from = (props.page - 1) * props.pageSize + 1
+    const to = Math.min(props.total, props.page * props.pageSize)
+    return `${from}–${to} of ${props.total}`
+})
+
+const pageItems = computed<(number | '...')[]>(() => {
+    // Compact list: 1, …, page-1, page, page+1, …, N (always show first, last, and a window around current).
+    const total = pageCount.value
+    const current = props.page
+    if (total <= 7) {
+        return Array.from({ length: total }, (_, i) => i + 1)
+    }
+    const items = new Set<number>([1, total, current, current - 1, current + 1])
+    const list = [...items].filter(p => p >= 1 && p <= total).sort((a, b) => a - b)
+    const out: (number | '...')[] = []
+    for (let i = 0; i < list.length; i++) {
+        if (i > 0 && list[i] - list[i - 1] > 1) out.push('...')
+        out.push(list[i])
+    }
+    return out
+})
+
+const pageSizeListboxOptions = computed(() =>
+    props.pageSizeOptions.map(size => ({ label: String(size), value: size }))
+)
+
+const pageSizeModel = computed<number>({
+    get: () => props.pageSize,
+    set: (value) => {
+        const next = Number(value)
+        if (!isNaN(next) && next !== props.pageSize) emit('update:pageSize', next)
+    }
+})
+
+function goTo (target: number) {
+    if (typeof target !== 'number') return
+    const next = Math.min(pageCount.value, Math.max(1, target))
+    if (next !== props.page) emit('update:page', next)
+}
+</script>
diff --git a/frontend/src/ui-components/components/form/ListBox.vue b/frontend/src/ui-components/components/form/ListBox.vue
index c07c9d8c90..d11bfc2023 100644
--- a/frontend/src/ui-components/components/form/ListBox.vue
+++ b/frontend/src/ui-components/components/form/ListBox.vue
@@ -3,6 +3,7 @@
              v-model="value"
              :disabled="disabled"
              class="ff-listbox"
+             :style="minWidth !== null ? { minWidth: minWidth + 'px' } : null"
              data-el="listbox"
              :data-select="selector"
              as="section"
@@ -165,6 +166,11 @@ export default {
             default: 200,
             type: [null, Number]
         },
+        minWidth: {
+            required: false,
+            default: null,
+            type: [null, Number]
+        },
         selector: {
             required: false,
             default: 'list-box',
diff --git a/frontend/src/ui-components/stylesheets/ff-components.scss b/frontend/src/ui-components/stylesheets/ff-components.scss
index b731f95b89..432f7ad744 100644
--- a/frontend/src/ui-components/stylesheets/ff-components.scss
+++ b/frontend/src/ui-components/stylesheets/ff-components.scss
@@ -899,6 +899,18 @@ li.ff-kebab-item {
       justify-content: flex-end;
     }
   }
+
+  // Flatten last-row corners only when the pagination footer actually renders.
+  &:has(.ff-pagination) .ff-data-table--data tbody .ff-data-table--row:last-child {
+    .ff-data-table--cell {
+      &:first-child {
+        border-bottom-left-radius: 0;
+      }
+      &:last-child {
+        border-bottom-right-radius: 0;
+      }
+    }
+  }
 }
 
 .ff-data-table thead .ff-checkbox,
@@ -926,6 +938,54 @@ li.ff-kebab-item {
   }
 }
 
+.ff-pagination {
+  display: flex;
+  align-items: center;
+  gap: $ff-unit-md;
+  flex-wrap: wrap;
+  padding: $ff-unit-sm $ff-unit-md;
+  border: 1px solid $ff-grey-300;
+  border-top: 0;
+  border-radius: 0 0 6px 6px;
+  background-color: white;
+  font-size: 14px;
+  color: $ff-grey-700;
+
+  &--page-size {
+    display: flex;
+    align-items: center;
+    gap: $ff-unit-sm;
+    label { white-space: nowrap; }
+  }
+
+  .ff-listbox .ff-button {
+    min-height: 28px;
+    padding: 2px 8px;
+  }
+
+  &--summary {
+    margin-left: auto;
+  }
+
+  &--pages {
+    display: flex;
+    align-items: center;
+    gap: 2px;
+
+    .ff-btn {
+      min-width: 28px;
+    }
+  }
+
+  &--ellipsis {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 20px;
+    color: $ff-grey-500;
+  }
+}
+
 /*
   FF Dialog Box
 */
diff --git a/test/e2e/frontend/cypress/tests-ee/applications/device-groups.spec.js b/test/e2e/frontend/cypress/tests-ee/applications/device-groups.spec.js
index 8a715e6583..0730f0201f 100644
--- a/test/e2e/frontend/cypress/tests-ee/applications/device-groups.spec.js
+++ b/test/e2e/frontend/cypress/tests-ee/applications/device-groups.spec.js
@@ -111,7 +111,7 @@ describe('FlowFuse - Application - Device Groups', () => {
         it('snapshot info is displayed', () => {
             // override the fixtures with the devices having snapshots
             cy.intercept('GET', '/api/*/applications/*/device-groups/*', deviceGroup1).as('getDeviceGroup')
-            cy.intercept('GET', '/api/*/applications/*/devices', applicationDevices).as('getApplicationDevices')
+            cy.intercept('GET', '/api/*/applications/*/devices*', applicationDevices).as('getApplicationDevices')
 
             // open the application page
             cy.visit(`/team/${team.slug}/applications/${application.id}`)
diff --git a/test/e2e/frontend/cypress/tests-ee/applications/pipelines.spec.js b/test/e2e/frontend/cypress/tests-ee/applications/pipelines.spec.js
index b9b2cfa9c1..d16b471478 100644
--- a/test/e2e/frontend/cypress/tests-ee/applications/pipelines.spec.js
+++ b/test/e2e/frontend/cypress/tests-ee/applications/pipelines.spec.js
@@ -492,7 +492,7 @@ describe('FlowFuse - Application - DevOps Pipelines', () => {
             })
         }).as('getPipelines')
         cy.intercept('POST', '/api/v1/pipelines').as('createPipeline')
-        cy.intercept('GET', '/api/v1/applications/*/devices', function (req) {
+        cy.intercept('GET', '/api/v1/applications/*/devices*', function (req) {
             req.continue((res) => {
                 res.body.devices = res.body.devices.map((device) => {
                     device.mode = 'developer'
diff --git a/test/e2e/frontend/cypress/tests-ee/rbac/rbac-dashboard-contextual.spec.js b/test/e2e/frontend/cypress/tests-ee/rbac/rbac-dashboard-contextual.spec.js
index 0b8b3a9a4c..30375e9e85 100644
--- a/test/e2e/frontend/cypress/tests-ee/rbac/rbac-dashboard-contextual.spec.js
+++ b/test/e2e/frontend/cypress/tests-ee/rbac/rbac-dashboard-contextual.spec.js
@@ -14,7 +14,7 @@ describe.skip('FlowFuse - RBAC Dashboard Contextual permissions', () => {
             team = response.body.teams.find(t => t.slug === 'rbac-team')
             const teamId = team.id
 
-            cy.intercept('GET', `/api/*/teams/${teamId}/projects`).as('getProjects')
+            cy.intercept('GET', `/api/*/teams/${teamId}/projects*`).as('getProjects')
 
             cy.get('[data-nav="team-instances"]').click()
 
@@ -24,7 +24,7 @@ describe.skip('FlowFuse - RBAC Dashboard Contextual permissions', () => {
                 instances = response.body.projects
             })
             .then(() => {
-                cy.intercept('GET', `/api/*/teams/${team.id}/devices`).as('getDevices')
+                cy.intercept('GET', `/api/*/teams/${team.id}/devices*`).as('getDevices')
                 cy.get('[data-nav="team-devices"]').click()
                 return cy.wait('@getDevices')
             })
@@ -125,7 +125,7 @@ describe.skip('FlowFuse - RBAC Dashboard Contextual permissions', () => {
     })
     it('should not be able to access hosted instance actions belonging to applications of viewer role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
 
         // the user should have a viewer role in this application
         const applicationViewerRoleApp = instances.find(i => i.name === 'application-3-instance-1')
@@ -270,7 +270,7 @@ describe.skip('FlowFuse - RBAC Dashboard Contextual permissions', () => {
     })
     it('should be able to access hosted instance actions belonging to applications of member role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
 
         // the user should have a member role in this application
         const memberRoleApp = instances.find(i => i.name === 'application-4-instance-1')
@@ -414,7 +414,7 @@ describe.skip('FlowFuse - RBAC Dashboard Contextual permissions', () => {
     })
     it('should be able to access hosted instance actions belonging to applications of owner role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
 
         // the user should have the owner role in this application
         const ownerRoleApp = instances.find(i => i.name === 'application-5-instance-1')
@@ -639,7 +639,7 @@ describe.skip('FlowFuse - RBAC Dashboard Contextual permissions', () => {
         cy.get('[data-el="nav-breadcrumb"]').contains('application-5-instance-1-device')
     })
     it('should not have restricted remote instances listed in the instances page', () => {
-        cy.intercept('GET', '/api/*/teams/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/teams/*/devices*').as('getDevices')
         cy.get('[data-nav="team-devices"]').click()
         cy.get('[data-el="page-name"]').contains('Remote Instances')
         cy.wait('@getDevices')
@@ -666,7 +666,7 @@ describe.skip('FlowFuse - RBAC Dashboard Contextual permissions', () => {
     })
     it('should not be able to access remote instance actions belonging to applications of viewer role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
         cy.intercept('POST', '/api/*/devices/*/logs*', {
             url: 'ws://dummy-url',
             username: 'mock-user',
@@ -742,7 +742,7 @@ describe.skip('FlowFuse - RBAC Dashboard Contextual permissions', () => {
     })
     it('should not be able to access remote instance actions belonging to applications of member role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
         cy.intercept('POST', '/api/*/devices/*/logs*', {
             url: 'ws://dummy-url',
             username: 'mock-user',
@@ -818,7 +818,7 @@ describe.skip('FlowFuse - RBAC Dashboard Contextual permissions', () => {
     })
     it('should not be able to access remote instance actions belonging to applications of owner role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
         cy.intercept('POST', '/api/*/devices/*/logs*', {
             url: 'ws://dummy-url',
             username: 'mock-user',
diff --git a/test/e2e/frontend/cypress/tests-ee/rbac/rbac-member-contextual.spec.js b/test/e2e/frontend/cypress/tests-ee/rbac/rbac-member-contextual.spec.js
index c7d491f018..56fd244e7a 100644
--- a/test/e2e/frontend/cypress/tests-ee/rbac/rbac-member-contextual.spec.js
+++ b/test/e2e/frontend/cypress/tests-ee/rbac/rbac-member-contextual.spec.js
@@ -14,7 +14,7 @@ describe('FlowFuse - RBAC Member Contextual permissions', () => {
             team = response.body.teams.find(t => t.slug === 'rbac-team')
             const teamId = team.id
 
-            cy.intercept('GET', `/api/*/teams/${teamId}/projects`).as('getProjects')
+            cy.intercept('GET', `/api/*/teams/${teamId}/projects*`).as('getProjects')
 
             cy.get('[data-nav="team-instances"]').click()
 
@@ -24,7 +24,7 @@ describe('FlowFuse - RBAC Member Contextual permissions', () => {
                 instances = response.body.projects
             })
             .then(() => {
-                cy.intercept('GET', `/api/*/teams/${team.id}/devices`).as('getDevices')
+                cy.intercept('GET', `/api/*/teams/${team.id}/devices*`).as('getDevices')
                 cy.get('[data-nav="team-devices"]').click()
                 return cy.wait('@getDevices')
             })
@@ -125,7 +125,7 @@ describe('FlowFuse - RBAC Member Contextual permissions', () => {
     })
     it('should not be able to access hosted instance actions belonging to applications of viewer role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
 
         // the user should have a viewer role in this application
         const applicationViewerRoleApp = instances.find(i => i.name === 'application-3-instance-1')
@@ -271,7 +271,7 @@ describe('FlowFuse - RBAC Member Contextual permissions', () => {
     })
     it('should be able to access hosted instance actions belonging to applications of member role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
 
         // the user should have a member role in this application
         const memberRoleApp = instances.find(i => i.name === 'application-4-instance-1')
@@ -416,7 +416,7 @@ describe('FlowFuse - RBAC Member Contextual permissions', () => {
     })
     it('should be able to access hosted instance actions belonging to applications of owner role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
 
         // the user should have the owner role in this application
         const ownerRoleApp = instances.find(i => i.name === 'application-5-instance-1')
@@ -649,7 +649,7 @@ describe('FlowFuse - RBAC Member Contextual permissions', () => {
         cy.get('[data-el="nav-breadcrumb"]').contains('application-5-instance-1-device')
     })
     it('should not have restricted remote instances listed in the instances page', () => {
-        cy.intercept('GET', '/api/*/teams/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/teams/*/devices*').as('getDevices')
         cy.get('[data-nav="team-devices"]').click()
         cy.get('[data-el="page-name"]').contains('Remote Instances')
         cy.wait('@getDevices')
@@ -676,7 +676,7 @@ describe('FlowFuse - RBAC Member Contextual permissions', () => {
     })
     it('should not be able to access remote instance actions belonging to applications of viewer role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
         cy.intercept('POST', '/api/*/devices/*/logs*', {
             url: 'ws://dummy-url',
             username: 'mock-user',
@@ -754,7 +754,7 @@ describe('FlowFuse - RBAC Member Contextual permissions', () => {
     })
     it('should not be able to access remote instance actions belonging to applications of member role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
         cy.intercept('POST', '/api/*/devices/*/logs*', {
             url: 'ws://dummy-url',
             username: 'mock-user',
@@ -832,7 +832,7 @@ describe('FlowFuse - RBAC Member Contextual permissions', () => {
     })
     it('should not be able to access remote instance actions belonging to applications of owner role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
         cy.intercept('POST', '/api/*/devices/*/logs*', {
             url: 'ws://dummy-url',
             username: 'mock-user',
diff --git a/test/e2e/frontend/cypress/tests-ee/rbac/rbac-owner-contextual.spec.js b/test/e2e/frontend/cypress/tests-ee/rbac/rbac-owner-contextual.spec.js
index c16151d589..fbbac01726 100644
--- a/test/e2e/frontend/cypress/tests-ee/rbac/rbac-owner-contextual.spec.js
+++ b/test/e2e/frontend/cypress/tests-ee/rbac/rbac-owner-contextual.spec.js
@@ -14,7 +14,7 @@ describe('FlowFuse - RBAC Owner Contextual permissions', () => {
             team = response.body.teams.find(t => t.slug === 'rbac-team')
             const teamId = team.id
 
-            cy.intercept('GET', `/api/*/teams/${teamId}/projects`).as('getProjects')
+            cy.intercept('GET', `/api/*/teams/${teamId}/projects*`).as('getProjects')
 
             cy.get('[data-nav="team-instances"]').click()
 
@@ -24,7 +24,7 @@ describe('FlowFuse - RBAC Owner Contextual permissions', () => {
                 instances = response.body.projects
             })
             .then(() => {
-                cy.intercept('GET', `/api/*/teams/${team.id}/devices`).as('getDevices')
+                cy.intercept('GET', `/api/*/teams/${team.id}/devices*`).as('getDevices')
                 cy.get('[data-nav="team-devices"]').click()
                 return cy.wait('@getDevices')
             })
@@ -125,7 +125,7 @@ describe('FlowFuse - RBAC Owner Contextual permissions', () => {
     })
     it('should not be able to access hosted instance actions belonging to applications of viewer role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
 
         // the user should have a viewer role in this application
         const applicationViewerRoleApp = instances.find(i => i.name === 'application-3-instance-1')
@@ -271,7 +271,7 @@ describe('FlowFuse - RBAC Owner Contextual permissions', () => {
     })
     it('should be able to access hosted instance actions belonging to applications of member role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
 
         // the user should have a member role in this application
         const memberRoleApp = instances.find(i => i.name === 'application-4-instance-1')
@@ -416,7 +416,7 @@ describe('FlowFuse - RBAC Owner Contextual permissions', () => {
     })
     it('should be able to access hosted instance actions belonging to applications of owner role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
 
         // the user should have the owner role in this application
         const ownerRoleApp = instances.find(i => i.name === 'application-5-instance-1')
@@ -641,7 +641,7 @@ describe('FlowFuse - RBAC Owner Contextual permissions', () => {
         cy.get('[data-el="nav-breadcrumb"]').contains('application-5-instance-1-device')
     })
     it('should not have restricted remote instances listed in the instances page', () => {
-        cy.intercept('GET', '/api/*/teams/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/teams/*/devices*').as('getDevices')
         cy.get('[data-nav="team-devices"]').click()
         cy.get('[data-el="page-name"]').contains('Remote Instances')
         cy.wait('@getDevices')
@@ -668,7 +668,7 @@ describe('FlowFuse - RBAC Owner Contextual permissions', () => {
     })
     it('should not be able to access remote instance actions belonging to applications of viewer role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
         cy.intercept('POST', '/api/*/devices/*/logs*', {
             url: 'ws://dummy-url',
             username: 'mock-user',
@@ -745,7 +745,7 @@ describe('FlowFuse - RBAC Owner Contextual permissions', () => {
     })
     it('should not be able to access remote instance actions belonging to applications of member role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
         cy.intercept('POST', '/api/*/devices/*/logs*', {
             url: 'ws://dummy-url',
             username: 'mock-user',
@@ -823,7 +823,7 @@ describe('FlowFuse - RBAC Owner Contextual permissions', () => {
     })
     it('should not be able to access remote instance actions belonging to applications of owner role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
         cy.intercept('POST', '/api/*/devices/*/logs*', {
             url: 'ws://dummy-url',
             username: 'mock-user',
diff --git a/test/e2e/frontend/cypress/tests-ee/rbac/rbac-viewer-contextual.spec.js b/test/e2e/frontend/cypress/tests-ee/rbac/rbac-viewer-contextual.spec.js
index b4b2e0a3aa..c7103a2285 100644
--- a/test/e2e/frontend/cypress/tests-ee/rbac/rbac-viewer-contextual.spec.js
+++ b/test/e2e/frontend/cypress/tests-ee/rbac/rbac-viewer-contextual.spec.js
@@ -14,7 +14,7 @@ describe('FlowFuse - RBAC Viewer Contextual permissions', () => {
             team = response.body.teams.find(t => t.slug === 'rbac-team')
             const teamId = team.id
 
-            cy.intercept('GET', `/api/*/teams/${teamId}/projects`).as('getProjects')
+            cy.intercept('GET', `/api/*/teams/${teamId}/projects*`).as('getProjects')
 
             cy.get('[data-nav="team-instances"]').click()
 
@@ -24,7 +24,7 @@ describe('FlowFuse - RBAC Viewer Contextual permissions', () => {
                 instances = response.body.projects
             })
             .then(() => {
-                cy.intercept('GET', `/api/*/teams/${team.id}/devices`).as('getDevices')
+                cy.intercept('GET', `/api/*/teams/${team.id}/devices*`).as('getDevices')
                 cy.get('[data-nav="team-devices"]').click()
                 return cy.wait('@getDevices')
             })
@@ -125,7 +125,7 @@ describe('FlowFuse - RBAC Viewer Contextual permissions', () => {
     })
     it('should not be able to access hosted instance actions belonging to applications of viewer role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
 
         // the user should have a viewer role in this application
         const applicationViewerRoleApp = instances.find(i => i.name === 'application-3-instance-1')
@@ -271,7 +271,7 @@ describe('FlowFuse - RBAC Viewer Contextual permissions', () => {
     })
     it('should be able to access hosted instance actions belonging to applications of member role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
 
         // the user should have a member role in this application
         const memberRoleApp = instances.find(i => i.name === 'application-4-instance-1')
@@ -416,7 +416,7 @@ describe('FlowFuse - RBAC Viewer Contextual permissions', () => {
     })
     it('should be able to access hosted instance actions belonging to applications of owner role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
 
         // the user should have the owner role in this application
         const ownerRoleApp = instances.find(i => i.name === 'application-5-instance-1')
@@ -626,7 +626,7 @@ describe('FlowFuse - RBAC Viewer Contextual permissions', () => {
         cy.get('[data-el="nav-breadcrumb"]').contains('application-5-instance-1-device')
     })
     it('should not have restricted remote instances listed in the instances page', () => {
-        cy.intercept('GET', '/api/*/teams/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/teams/*/devices*').as('getDevices')
         cy.get('[data-nav="team-devices"]').click()
         cy.get('[data-el="page-name"]').contains('Remote Instances')
         cy.wait('@getDevices')
@@ -653,7 +653,7 @@ describe('FlowFuse - RBAC Viewer Contextual permissions', () => {
     })
     it('should not be able to access remote instance actions belonging to applications of viewer role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
         cy.intercept('POST', '/api/*/devices/*/logs*', {
             url: 'ws://dummy-url',
             username: 'mock-user',
@@ -731,7 +731,7 @@ describe('FlowFuse - RBAC Viewer Contextual permissions', () => {
     })
     it('should not be able to access remote instance actions belonging to applications of member role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
         cy.intercept('POST', '/api/*/devices/*/logs*', {
             url: 'ws://dummy-url',
             username: 'mock-user',
@@ -809,7 +809,7 @@ describe('FlowFuse - RBAC Viewer Contextual permissions', () => {
     })
     it('should not be able to access remote instance actions belonging to applications of owner role', () => {
         cy.intercept('GET', '/api/*/teams/1/applications').as('getApplications')
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getDevices')
         cy.intercept('POST', '/api/*/devices/*/logs*', {
             url: 'ws://dummy-url',
             username: 'mock-user',
diff --git a/test/e2e/frontend/cypress/tests/admin.spec.js b/test/e2e/frontend/cypress/tests/admin.spec.js
index 0acc9e6ee9..bd9305e51c 100644
--- a/test/e2e/frontend/cypress/tests/admin.spec.js
+++ b/test/e2e/frontend/cypress/tests/admin.spec.js
@@ -97,7 +97,7 @@ describe('FlowFuse platform admin users', () => {
 
     it("can view devices from teams they're not a member of", () => {
         cy.intercept('GET', '/api/*/projects/*').as('getProject')
-        cy.intercept('GET', '/api/*/teams/*/devices').as('getDevices')
+        cy.intercept('GET', '/api/*/teams/*/devices*').as('getDevices')
         cy.intercept('GET', '/api/*/devices/*').as('getDevice')
 
         cy.visit('/admin/overview')
diff --git a/test/e2e/frontend/cypress/tests/devices.spec.js b/test/e2e/frontend/cypress/tests/devices.spec.js
index 20fc761c0e..a8ed4c3c42 100644
--- a/test/e2e/frontend/cypress/tests/devices.spec.js
+++ b/test/e2e/frontend/cypress/tests/devices.spec.js
@@ -4,7 +4,7 @@ import deviceRunning from '../fixtures/device-running.json'
 describe('FlowFuse - Team Devices', () => {
     describe('team with no devices', () => {
         beforeEach(() => {
-            cy.intercept('GET', '/api/*/teams/*/devices').as('getDevices')
+            cy.intercept('GET', '/api/*/teams/*/devices*').as('getDevices')
             cy.login('alice', 'aaPassword')
             cy.home()
 
@@ -71,44 +71,171 @@ describe('FlowFuse - Team Devices', () => {
             cy.get('main').contains('Connect your First Remote Instance')
         })
 
-        it('can load multiple pages of devices when the API paginates', function () {
-            // Mock active and inactive stacks having multiple pages
-            cy.intercept('GET', '/api/v1/teams/*/devices*', {
-                count: 2,
-                meta: { next_cursor: 'next' },
-                devices: [deviceOffline]
-            }).as('getDevicesPaginated')
+        it('renders numeric pagination and lets the user move between pages', function () {
+            // statusOnly poll feeds the status bars AND the v-if that mounts the table —
+            // empty `devices` keeps the table hidden, so seed it with the full set.
+            const allDevices = Array.from({ length: 30 }, (_, i) => ({
+                ...deviceOffline,
+                id: i + 1,
+                name: `device-${i + 1}`
+            }))
+            cy.intercept('GET', '/api/v1/teams/*/devices?statusOnly=true', {
+                count: 30,
+                devices: allDevices
+            }).as('getDeviceStatus')
+
+            // Mock page 1: 25 devices returned, total = 30 → footer shows, 2 pages.
+            cy.intercept({
+                method: 'GET',
+                pathname: '/api/v1/teams/*/devices',
+                query: { page: '1' }
+            }, {
+                count: 30,
+                meta: { page: 1, pageSize: 25, total: 30, pageCount: 2 },
+                devices: Array.from({ length: 25 }, (_, i) => ({
+                    ...deviceOffline,
+                    id: i + 1,
+                    name: `device-${i + 1}`
+                }))
+            }).as('getDevicesPage1')
 
             cy.request('GET', '/api/v1/teams/')
                 .then((response) => {
                     const team = response.body.teams[0]
                     cy.visit(`/team/${team.slug}/devices`)
-                    cy.wait('@getDevicesPaginated')
+                    cy.wait('@getDevicesPage1')
                 })
 
-            // Load more active
-            cy.get('[data-el="devices-browser"] tbody').find('tr').should('have.length', 1)
+            // Page 1: full slice rendered, footer present, page-1 button is current.
+            cy.get('[data-el="devices-browser"] tbody').find('tr').should('have.length', 25)
+            cy.get('[data-el="pagination"]').should('exist')
+            cy.get('[data-action="page-1"]').should('have.class', 'ff-btn--primary')
+            cy.get('[data-action="page-2"]').should('exist')
+
+            // Mock page 2: remaining 5 devices.
+            cy.intercept({
+                method: 'GET',
+                pathname: '/api/v1/teams/*/devices',
+                query: { page: '2' }
+            }, {
+                count: 30,
+                meta: { page: 2, pageSize: 25, total: 30, pageCount: 2 },
+                devices: Array.from({ length: 5 }, (_, i) => ({
+                    ...deviceOffline,
+                    id: 26 + i,
+                    name: `device-${26 + i}`
+                }))
+            }).as('getDevicesPage2')
+
+            cy.get('[data-action="page-2"]').click()
+            cy.wait('@getDevicesPage2')
+
+            // Page 2: smaller slice rendered, page-2 button is now current.
+            cy.get('[data-el="devices-browser"] tbody').find('tr').should('have.length', 5)
+            cy.get('[data-el="devices-browser"] tbody').contains('td', 'device-26')
+            cy.get('[data-action="page-2"]').should('have.class', 'ff-btn--primary')
+        })
+
+        it('prev/next buttons advance and return between pages', function () {
+            const allDevices = Array.from({ length: 30 }, (_, i) => ({
+                ...deviceOffline,
+                id: i + 1,
+                name: `device-${i + 1}`
+            }))
+            cy.intercept('GET', '/api/v1/teams/*/devices?statusOnly=true', {
+                count: 30,
+                devices: allDevices
+            }).as('getDeviceStatus')
+
+            cy.intercept({
+                method: 'GET',
+                pathname: '/api/v1/teams/*/devices',
+                query: { page: '1' }
+            }, {
+                count: 30,
+                meta: { page: 1, pageSize: 25, total: 30, pageCount: 2 },
+                devices: Array.from({ length: 25 }, (_, i) => ({
+                    ...deviceOffline,
+                    id: i + 1,
+                    name: `device-${i + 1}`
+                }))
+            }).as('getDevicesPage1')
+
+            cy.intercept({
+                method: 'GET',
+                pathname: '/api/v1/teams/*/devices',
+                query: { page: '2' }
+            }, {
+                count: 30,
+                meta: { page: 2, pageSize: 25, total: 30, pageCount: 2 },
+                devices: Array.from({ length: 5 }, (_, i) => ({
+                    ...deviceOffline,
+                    id: 26 + i,
+                    name: `device-${26 + i}`
+                }))
+            }).as('getDevicesPage2')
 
-            cy.intercept('GET', '/api/v1/teams/*/devices?cursor=next', {
-                count: 2,
-                meta: { next_cursor: null },
-                devices: [{ ...deviceOffline, ...{ id: 2, name: 'device-2' } }]
-            }).as('getDevicesNextPage')
+            cy.request('GET', '/api/v1/teams/')
+                .then((response) => {
+                    const team = response.body.teams[0]
+                    cy.visit(`/team/${team.slug}/devices`)
+                    cy.wait('@getDevicesPage1')
+                })
 
-            cy.get('[data-action="load-more"]').click()
+            // Prev disabled on page 1; Next advances to page 2.
+            cy.get('[data-action="page-prev"]').should('be.disabled')
+            cy.get('[data-action="page-next"]').click()
+            cy.wait('@getDevicesPage2')
+            cy.get('[data-action="page-2"]').should('have.class', 'ff-btn--primary')
+
+            // Next disabled on last page; Prev returns to page 1.
+            cy.get('[data-action="page-next"]').should('be.disabled')
+            cy.get('[data-action="page-prev"]').click()
+            cy.wait('@getDevicesPage1')
+            cy.get('[data-action="page-1"]').should('have.class', 'ff-btn--primary')
+        })
 
-            cy.wait('@getDevicesNextPage')
+        it('hides the pagination footer when total fits within the smallest page size', function () {
+            const allDevices = Array.from({ length: 5 }, (_, i) => ({
+                ...deviceOffline,
+                id: i + 1,
+                name: `device-${i + 1}`
+            }))
+            cy.intercept('GET', '/api/v1/teams/*/devices?statusOnly=true', {
+                count: 5,
+                devices: allDevices
+            }).as('getDeviceStatus')
+
+            // Total of 5 ≤ 10 (smallest page-size option) → footer should not render.
+            cy.intercept({
+                method: 'GET',
+                pathname: '/api/v1/teams/*/devices',
+                query: { page: '1' }
+            }, {
+                count: 5,
+                meta: { page: 1, pageSize: 25, total: 5, pageCount: 1 },
+                devices: Array.from({ length: 5 }, (_, i) => ({
+                    ...deviceOffline,
+                    id: i + 1,
+                    name: `device-${i + 1}`
+                }))
+            }).as('getDevicesSmall')
 
-            cy.get('[data-el="devices-browser"] tbody').find('tr').should('have.length', 2)
-            cy.get('[data-el="devices-browser"] tbody').contains('td', 'device-2')
+            cy.request('GET', '/api/v1/teams/')
+                .then((response) => {
+                    const team = response.body.teams[0]
+                    cy.visit(`/team/${team.slug}/devices`)
+                    cy.wait('@getDevicesSmall')
+                })
 
-            cy.get('[data-action="load-more"]').should('not.exist')
+            cy.get('[data-el="devices-browser"] tbody').find('tr').should('have.length', 5)
+            cy.get('[data-el="pagination"]').should('not.exist')
         })
     })
 
     describe('team with devices', () => {
         beforeEach(() => {
-            cy.intercept('GET', '/api/*/teams/*/devices').as('getDevices')
+            cy.intercept('GET', '/api/*/teams/*/devices*').as('getDevices')
             cy.login('bob', 'bbPassword')
             cy.home()
 
@@ -120,56 +247,123 @@ describe('FlowFuse - Team Devices', () => {
                 })
         })
 
-        describe('with a single page (client side filtering)', () => {
+        // Small dataset (under the pagination footer threshold) — filters still go server-side.
+        // This describe complements the multi-page block below by verifying the same flow works
+        // when the rows-per-page selector is hidden.
+        describe('with a small dataset (no pagination footer)', () => {
             it('can filter the device browser by "last seen" values', () => {
                 // ensure we have something "last seen" in the past 1.5 mins
                 deviceRunning.lastSeenAt = (new Date()).toISOString()
-                cy.intercept('GET', '/api/v1/teams/*/devices*', {
+
+                cy.intercept('GET', '/api/v1/teams/*/devices?statusOnly=true', {
                     count: 2,
-                    meta: {},
                     devices: [deviceOffline, deviceRunning]
-                }).as('getDevicesNextPage')
+                }).as('getDeviceStatus')
+
+                // Unfiltered initial fetch.
+                cy.intercept({
+                    method: 'GET',
+                    pathname: '/api/v1/teams/*/devices',
+                    query: { page: '1' }
+                }, req => {
+                    // Let the per-filter intercepts below handle requests that carry a filter param.
+                    if (req.query.filters) return
+                    req.reply({
+                        count: 2,
+                        meta: { page: 1, pageSize: 25, total: 2, pageCount: 1 },
+                        devices: [deviceOffline, deviceRunning]
+                    })
+                }).as('getDevicesUnfiltered')
 
                 cy.visit('/team/bteam/devices')
+                cy.wait('@getDevicesUnfiltered')
                 cy.contains('device-1')
                 cy.contains('device-2')
 
-                // apply filter
+                cy.intercept({
+                    method: 'GET',
+                    pathname: '/api/v1/teams/*/devices',
+                    query: { filters: 'lastseen:never' }
+                }, {
+                    count: 1,
+                    meta: { page: 1, pageSize: 25, total: 1, pageCount: 1 },
+                    devices: [deviceOffline]
+                }).as('getDevicesFilteredNever')
+
                 cy.get('[data-el="devicestatus-lastseen"] .ff-chart-bar.ff-chart-bar--never').click()
+                cy.wait('@getDevicesFilteredNever')
                 cy.contains('device-1')
                 cy.contains('device-2').should('not.exist')
 
-                // select different filter value
-                cy.get('[data-el="devicestatus-lastseen"] .ff-chart-bar.ff-chart-bar--running').click()
-                cy.contains('device-1').should('not.exist')
-                cy.contains('device-2')
+                cy.intercept({
+                    method: 'GET',
+                    pathname: '/api/v1/teams/*/devices',
+                    query: { filters: 'lastseen:running' }
+                }, {
+                    count: 1,
+                    meta: { page: 1, pageSize: 25, total: 1, pageCount: 1 },
+                    devices: [deviceRunning]
+                }).as('getDevicesFilteredRunning')
 
-                // reverse the filter
                 cy.get('[data-el="devicestatus-lastseen"] .ff-chart-bar.ff-chart-bar--running').click()
-                cy.contains('device-1')
+                cy.wait('@getDevicesFilteredRunning')
+                cy.contains('device-1').should('not.exist')
                 cy.contains('device-2')
             })
 
             it('can filter the device browser by "status" values', () => {
-                // ensure we have something "last seen" in the past 1.5 mins
                 deviceRunning.lastSeenAt = (new Date()).toISOString()
-                cy.intercept('GET', '/api/v1/teams/*/devices*', {
+
+                cy.intercept('GET', '/api/v1/teams/*/devices?statusOnly=true', {
                     count: 2,
-                    meta: {},
                     devices: [deviceOffline, deviceRunning]
-                }).as('getDevicesNextPage')
+                }).as('getDeviceStatus')
+
+                cy.intercept({
+                    method: 'GET',
+                    pathname: '/api/v1/teams/*/devices',
+                    query: { page: '1' }
+                }, req => {
+                    if (req.query.filters) return
+                    req.reply({
+                        count: 2,
+                        meta: { page: 1, pageSize: 25, total: 2, pageCount: 1 },
+                        devices: [deviceOffline, deviceRunning]
+                    })
+                }).as('getDevicesUnfiltered')
 
                 cy.visit('/team/bteam/devices')
+                cy.wait('@getDevicesUnfiltered')
                 cy.contains('device-1')
                 cy.contains('device-2')
 
-                // apply filter
+                cy.intercept({
+                    method: 'GET',
+                    pathname: '/api/v1/teams/*/devices',
+                    query: { filters: 'status:offline' }
+                }, {
+                    count: 1,
+                    meta: { page: 1, pageSize: 25, total: 1, pageCount: 1 },
+                    devices: [deviceOffline]
+                }).as('getDevicesFilteredOffline')
+
                 cy.get('[data-el="devicestatus-status"] .ff-chart-bar.ff-chart-bar--offline').click()
+                cy.wait('@getDevicesFilteredOffline')
                 cy.contains('device-1')
                 cy.contains('device-2').should('not.exist')
 
-                // select different filter value
+                cy.intercept({
+                    method: 'GET',
+                    pathname: '/api/v1/teams/*/devices',
+                    query: { filters: 'status:running' }
+                }, {
+                    count: 1,
+                    meta: { page: 1, pageSize: 25, total: 1, pageCount: 1 },
+                    devices: [deviceRunning]
+                }).as('getDevicesFilteredRunning')
+
                 cy.get('[data-el="devicestatus-status"] .ff-chart-bar.ff-chart-bar--running').click()
+                cy.wait('@getDevicesFilteredRunning')
                 cy.contains('device-1').should('not.exist')
                 cy.contains('device-2')
 
@@ -185,7 +379,7 @@ describe('FlowFuse - Team Devices', () => {
                 const secondOfflineDevice = { ...deviceOffline, name: 'device-3', id: 3 }
 
                 deviceRunning.lastSeenAt = (new Date()).toISOString()
-                cy.intercept('GET', '/api/v1/teams/*/devices', {
+                cy.intercept('GET', '/api/v1/teams/*/devices*', {
                     count: 3,
                     meta: { next_cursor: 'next' },
                     devices: [deviceOffline, deviceRunning]
@@ -201,7 +395,11 @@ describe('FlowFuse - Team Devices', () => {
                 cy.contains('device-1') // offline
                 cy.contains('device-2') // online
 
-                cy.intercept('GET', '/api/v1/teams/*/devices?filters=lastseen%3Anever', {
+                cy.intercept({
+                    method: 'GET',
+                    pathname: '/api/v1/teams/*/devices',
+                    query: { filters: 'lastseen:never' }
+                }, {
                     count: 1,
                     meta: { next_cursor: null },
                     devices: [deviceOffline, secondOfflineDevice]
@@ -214,7 +412,11 @@ describe('FlowFuse - Team Devices', () => {
                 cy.contains('device-2').should('not.exist') // online
                 cy.contains('device-3') // offline
 
-                cy.intercept('GET', '/api/v1/teams/*/devices?filters=lastseen%3Arunning', {
+                cy.intercept({
+                    method: 'GET',
+                    pathname: '/api/v1/teams/*/devices',
+                    query: { filters: 'lastseen:running' }
+                }, {
                     count: 1,
                     meta: { next_cursor: null },
                     devices: [deviceRunning]
@@ -236,7 +438,7 @@ describe('FlowFuse - Team Devices', () => {
 
             it('can filter the device browser by "status" values', () => {
                 const secondOfflineDevice = { ...deviceOffline, name: 'device-3', id: '3' }
-                cy.intercept('GET', '/api/v1/teams/*/devices', {
+                cy.intercept('GET', '/api/v1/teams/*/devices*', {
                     count: 3,
                     meta: { next_cursor: 'next' },
                     devices: [deviceOffline, deviceRunning]
@@ -252,7 +454,11 @@ describe('FlowFuse - Team Devices', () => {
                 cy.contains('device-1') // offline
                 cy.contains('device-2') // running
 
-                cy.intercept('GET', '/api/v1/teams/*/devices?filters=status%3Aoffline', {
+                cy.intercept({
+                    method: 'GET',
+                    pathname: '/api/v1/teams/*/devices',
+                    query: { filters: 'status:offline' }
+                }, {
                     count: 1,
                     meta: { next_cursor: null },
                     devices: [deviceOffline, secondOfflineDevice]
@@ -265,7 +471,11 @@ describe('FlowFuse - Team Devices', () => {
                 cy.contains('device-2').should('not.exist') // running
                 cy.contains('device-3') // offline
 
-                cy.intercept('GET', '/api/v1/teams/*/devices?filters=status%3Arunning', {
+                cy.intercept({
+                    method: 'GET',
+                    pathname: '/api/v1/teams/*/devices',
+                    query: { filters: 'status:running' }
+                }, {
                     count: 1,
                     meta: { next_cursor: null },
                     devices: [deviceRunning]
diff --git a/test/e2e/frontend/cypress/tests/devices/assignment.spec.js b/test/e2e/frontend/cypress/tests/devices/assignment.spec.js
index ee79503d30..2a137d6794 100644
--- a/test/e2e/frontend/cypress/tests/devices/assignment.spec.js
+++ b/test/e2e/frontend/cypress/tests/devices/assignment.spec.js
@@ -141,7 +141,7 @@ describe('FlowFuse - Application - Devices - Create', () => {
     }
 
     beforeEach(() => {
-        cy.intercept('GET', '/api/v1/applications/*/devices').as('getApplicationDevices')
+        cy.intercept('GET', '/api/v1/applications/*/devices*').as('getApplicationDevices')
         cy.login('bob', 'bbPassword')
     })
 
diff --git a/test/e2e/frontend/cypress/tests/instances/devices.spec.js b/test/e2e/frontend/cypress/tests/instances/devices.spec.js
index f87c06658c..c23a5c72dc 100644
--- a/test/e2e/frontend/cypress/tests/instances/devices.spec.js
+++ b/test/e2e/frontend/cypress/tests/instances/devices.spec.js
@@ -17,7 +17,7 @@ describe('FlowFuse - Instance - Devices', () => {
     }
 
     beforeEach(() => {
-        cy.intercept('GET', '/api/*/projects/*/devices').as('getInstanceRemoteInstances') // TODO currently waiting on project API, rather than instances
+        cy.intercept('GET', '/api/*/projects/*/devices*').as('getInstanceRemoteInstances') // TODO currently waiting on project API, rather than instances
 
         cy.login('bob', 'bbPassword')
         cy.home()
diff --git a/test/e2e/frontend/cypress/tests/team/instances.spec.js b/test/e2e/frontend/cypress/tests/team/instances.spec.js
index 9b54db6a87..6ec7229dbe 100644
--- a/test/e2e/frontend/cypress/tests/team/instances.spec.js
+++ b/test/e2e/frontend/cypress/tests/team/instances.spec.js
@@ -22,7 +22,7 @@ describe('Team - Instances', () => {
 
         cy.intercept(
             'GET',
-            '/api/*/teams/*/projects',
+            '/api/*/teams/*/projects*',
             req => req.reply(res => {
                 res.send({
                     projects: res.body.projects.map(instance => ({ ...instance, ...{ settings: { dashboard2UI: '/dashboard' } } }))
diff --git a/test/unit/forge/routes/api/teamDevices_spec.js b/test/unit/forge/routes/api/teamDevices_spec.js
index 2ca126c0dc..d925fc112d 100644
--- a/test/unit/forge/routes/api/teamDevices_spec.js
+++ b/test/unit/forge/routes/api/teamDevices_spec.js
@@ -252,6 +252,16 @@ describe('Team Devices API', function () {
                 resultNameAsc.map((device) => device.name).should.match(['device 1', 'device 2', 'device 3', 'device 4'])
             })
 
+            it('accepts dir as a synonym for order (frontend sends dir)', async function () {
+                // Pre-fix the controller only read `order`; `dir=desc` was silently ignored and
+                // results came back ASC. This pins the working DESC behavior under the dir param.
+                const resultDirDesc = await queryDevices(`/api/v1/teams/${TestObjects.ATeam.hashid}/devices?sort=name&dir=desc`)
+                resultDirDesc.map((device) => device.name).should.match(['device 4', 'device 3', 'device 2', 'device 1'])
+
+                const resultDirAsc = await queryDevices(`/api/v1/teams/${TestObjects.ATeam.hashid}/devices?sort=name&dir=asc`)
+                resultDirAsc.map((device) => device.name).should.match(['device 1', 'device 2', 'device 3', 'device 4'])
+            })
+
             it('by instance->application name', async function () {
                 // Sort by application name ASC (default)
                 const resultName = await queryDevices(`/api/v1/teams/${TestObjects.ATeam.hashid}/devices?sort=application`)
@@ -307,6 +317,67 @@ describe('Team Devices API', function () {
             })
         })
 
+        describe('Supports offset/page pagination', function () {
+            before(async function () {
+                // device 1 already exists from outer beforeEach; add 3 more for 4 total.
+                await app.factory.createDevice({ name: 'page-device 2' }, TestObjects.ATeam, TestObjects.Project1)
+                await app.factory.createDevice({ name: 'page-device 3' }, TestObjects.ATeam, TestObjects.Project1)
+                await app.factory.createDevice({ name: 'page-device 4' }, TestObjects.ATeam, TestObjects.Project1)
+            })
+
+            after(async function () {
+                await app.db.models.Device.destroy({
+                    where: { name: ['page-device 2', 'page-device 3', 'page-device 4'] }
+                })
+            })
+
+            it('?page=1&limit=2 returns first slice with offset-mode meta and true total in count', async function () {
+                const result = await queryDevices(
+                    `/api/v1/teams/${TestObjects.ATeam.hashid}/devices?page=1&limit=2&sort=name&dir=asc`,
+                    200, undefined, true
+                )
+                result.devices.should.have.length(2)
+                // count is now the unbounded total (not page length — that was the pre-fix bug).
+                result.should.have.property('count', 4)
+                result.should.have.property('meta')
+                result.meta.should.have.property('page', 1)
+                result.meta.should.have.property('pageSize', 2)
+                result.meta.should.have.property('total', 4)
+                result.meta.should.have.property('pageCount', 2)
+                // Offset mode shouldn't emit a cursor.
+                should(result.meta.next_cursor).be.undefined()
+            })
+
+            it('?page=2 returns the second slice with non-overlapping rows', async function () {
+                const pageOne = await queryDevices(
+                    `/api/v1/teams/${TestObjects.ATeam.hashid}/devices?page=1&limit=2&sort=name&dir=asc`
+                )
+                const pageTwo = await queryDevices(
+                    `/api/v1/teams/${TestObjects.ATeam.hashid}/devices?page=2&limit=2&sort=name&dir=asc`,
+                    200, undefined, true
+                )
+                pageTwo.devices.should.have.length(2)
+                pageTwo.meta.should.have.property('page', 2)
+                const idsOne = pageOne.map(d => d.id)
+                const idsTwo = pageTwo.devices.map(d => d.id)
+                idsTwo.forEach(id => idsOne.should.not.containEql(id))
+            })
+
+            it('meta.total reflects the filtered count, not the unfiltered scope total', async function () {
+                // 4 devices in scope, but searching for "page-device 2" should match only one.
+                // Pre-fix bug: count ran against bare `where` so it returned 4 — pagination
+                // footer claimed multiple pages for a single-row result set.
+                const result = await queryDevices(
+                    `/api/v1/teams/${TestObjects.ATeam.hashid}/devices?page=1&limit=2&query=page-device%202`,
+                    200, undefined, true
+                )
+                result.devices.should.have.length(1)
+                result.should.have.property('count', 1)
+                result.meta.should.have.property('total', 1)
+                result.meta.should.have.property('pageCount', 1)
+            })
+        })
+
         describe('Supports filtering the devices', function () {
             before(async function () {
                 await app.factory.createDevice({ name: 'device 2', state: 'running', lastSeenAt: new Date() }, TestObjects.ATeam, TestObjects.Project1)
diff --git a/test/unit/forge/routes/api/team_spec.js b/test/unit/forge/routes/api/team_spec.js
index 4bc8e47b94..90bd733c81 100644
--- a/test/unit/forge/routes/api/team_spec.js
+++ b/test/unit/forge/routes/api/team_spec.js
@@ -754,6 +754,100 @@ describe('Team API', function () {
             })
             response.statusCode.should.equal(404)
         })
+
+        it('Paginates with page+limit and returns total in meta', async function () {
+            // 4 projects exist (app.project + 3 created in beforeEach)
+            const response = await app.inject({
+                method: 'GET',
+                url: `/api/v1/teams/${TestObjects.ATeam.hashid}/projects?page=1&limit=2`,
+                cookies: { sid: TestObjects.tokens.alice }
+            })
+            response.statusCode.should.equal(200)
+            const result = response.json()
+            result.projects.should.have.length(2)
+            result.should.have.property('count', 4)
+            result.should.have.property('meta')
+            result.meta.should.have.property('page', 1)
+            result.meta.should.have.property('pageSize', 2)
+            result.meta.should.have.property('total', 4)
+            result.meta.should.have.property('pageCount', 2)
+        })
+
+        it('Server-side search filters by project name (case-insensitive)', async function () {
+            const response = await app.inject({
+                method: 'GET',
+                url: `/api/v1/teams/${TestObjects.ATeam.hashid}/projects?page=1&limit=25&query=LIST-INSTANCE-1`,
+                cookies: { sid: TestObjects.tokens.alice }
+            })
+            response.statusCode.should.equal(200)
+            const result = response.json()
+            // 'list-instance-1' matches 'list-instance-1' only (not list-instance-2/3)
+            result.projects.should.have.length(1)
+            result.projects[0].should.have.property('name', 'list-instance-1')
+            result.meta.should.have.property('total', 1)
+        })
+
+        it('Sort by name ascending returns expected order', async function () {
+            const response = await app.inject({
+                method: 'GET',
+                url: `/api/v1/teams/${TestObjects.ATeam.hashid}/projects?page=1&limit=25&sort=name&dir=asc`,
+                cookies: { sid: TestObjects.tokens.alice }
+            })
+            response.statusCode.should.equal(200)
+            const result = response.json()
+            const names = result.projects.map(p => p.name)
+            const sorted = [...names].sort()
+            names.should.deepEqual(sorted)
+        })
+
+        it('Sort by name descending returns reverse order', async function () {
+            const response = await app.inject({
+                method: 'GET',
+                url: `/api/v1/teams/${TestObjects.ATeam.hashid}/projects?page=1&limit=25&sort=name&dir=desc`,
+                cookies: { sid: TestObjects.tokens.alice }
+            })
+            response.statusCode.should.equal(200)
+            const result = response.json()
+            const names = result.projects.map(p => p.name)
+            const sorted = [...names].sort().reverse()
+            names.should.deepEqual(sorted)
+        })
+
+        it('page=2 returns the second slice with correct offset', async function () {
+            // 4 projects, limit=2 → page 1 = first two, page 2 = remaining two.
+            // Pin the order so offset arithmetic is deterministic.
+            const pageOne = await app.inject({
+                method: 'GET',
+                url: `/api/v1/teams/${TestObjects.ATeam.hashid}/projects?page=1&limit=2&sort=name&dir=asc`,
+                cookies: { sid: TestObjects.tokens.alice }
+            })
+            const pageTwo = await app.inject({
+                method: 'GET',
+                url: `/api/v1/teams/${TestObjects.ATeam.hashid}/projects?page=2&limit=2&sort=name&dir=asc`,
+                cookies: { sid: TestObjects.tokens.alice }
+            })
+            pageTwo.statusCode.should.equal(200)
+            const r1 = pageOne.json()
+            const r2 = pageTwo.json()
+            r2.projects.should.have.length(2)
+            r2.meta.should.have.property('page', 2)
+            r2.meta.should.have.property('total', 4)
+            // The two pages must not overlap.
+            const ids1 = r1.projects.map(p => p.id)
+            const ids2 = r2.projects.map(p => p.id)
+            ids2.forEach(id => ids1.should.not.containEql(id))
+        })
+
+        it('schema.querystring rejects an invalid sort key', async function () {
+            // Confirms the `enum` in the route schema actually enforces — proves we're using
+            // `schema.querystring` (honored) rather than bare `query:` (silently ignored).
+            const response = await app.inject({
+                method: 'GET',
+                url: `/api/v1/teams/${TestObjects.ATeam.hashid}/projects?page=1&sort=nope`,
+                cookies: { sid: TestObjects.tokens.alice }
+            })
+            response.statusCode.should.equal(400)
+        })
     })
 
     describe('Get a list of a teams dashboard instances', () => {