diff --git a/packages/cli/src/modules/data-store/__tests__/data-store.service.test.ts b/packages/cli/src/modules/data-store/__tests__/data-store.service.test.ts
index f35db0b8b27..abef65793e0 100644
--- a/packages/cli/src/modules/data-store/__tests__/data-store.service.test.ts
+++ b/packages/cli/src/modules/data-store/__tests__/data-store.service.test.ts
@@ -1,10 +1,10 @@
+import type { AddDataStoreColumnDto } from '@n8n/api-types';
 import { createTeamProject, testDb, testModules } from '@n8n/backend-test-utils';
 import { Project } from '@n8n/db';
 import { Container } from '@n8n/di';
 
 import type { DataStoreEntity } from '../data-store.entity';
 import { DataStoreService } from '../data-store.service';
-import { AddDataStoreColumnDto } from '@n8n/api-types';
 
 beforeAll(async () => {
 	await testModules.loadModules(['data-store']);
@@ -282,6 +282,52 @@ describe('dataStore', () => {
 			expect(result[0].map((x) => x.name).sort()).toEqual(names.sort());
 			expect(result[1]).toEqual(11);
 		});
+		it('should retrieve by id with pagination', async () => {
+			// ARRANGE
+			const names = [dataStore1.name];
+			for (let i = 0; i < 10; ++i) {
+				const ds = (await dataStoreService.createDataStore({
+					name: `anotherDataStore${i}`,
+					projectId: project1.id,
+					columns: [],
+				})) as DataStoreEntity;
+				names.push(ds.name);
+			}
+
+			// ACT
+			const p0 = await dataStoreService.getManyAndCount({
+				filter: { projectId: project1.id },
+				skip: 0,
+				take: 3,
+			});
+			const p1 = await dataStoreService.getManyAndCount({
+				filter: { projectId: project1.id },
+				skip: 3,
+				take: 3,
+			});
+			const rest = await dataStoreService.getManyAndCount({
+				filter: { projectId: project1.id },
+				skip: 6,
+			});
+
+			// ASSERT
+			expect(p0[1]).toBe(11);
+			expect(p0[0]).toHaveLength(3);
+
+			expect(p1[1]).toBe(11);
+			expect(p1[0]).toHaveLength(3);
+
+			expect(rest[1]).toBe(11);
+			expect(rest[0]).toHaveLength(5);
+
+			expect(
+				p0[0]
+					.concat(p1[0])
+					.concat(rest[0])
+					.map((x) => x.name)
+					.sort(),
+			).toEqual(names.sort());
+		});
 		it('correctly joins columns', async () => {
 			// ARRANGE
 			const columns = [
diff --git a/packages/cli/src/modules/data-store/data-store.repository.ts b/packages/cli/src/modules/data-store/data-store.repository.ts
index a92d4d6f435..6f874cfa998 100644
--- a/packages/cli/src/modules/data-store/data-store.repository.ts
+++ b/packages/cli/src/modules/data-store/data-store.repository.ts
@@ -60,7 +60,6 @@ export class DataStoreRepository extends Repository<DataStoreEntity> {
 		for (const x of ['id', 'projectId'] as const) {
 			const content = [filter?.[x]].flat().filter((x) => x !== undefined);
 			if (content.length === 0) continue;
-			console.log(content);
 
 			query.andWhere(`dataStore.${x} IN (:...${x}s)`, {
 				/*
@@ -111,9 +110,9 @@ export class DataStoreRepository extends Repository<DataStoreEntity> {
 		query: SelectQueryBuilder<DataStoreEntity>,
 		options: DataStoreListOptions,
 	): void {
-		if (options?.take) {
-			query.skip(options.skip ?? 0).take(options.take);
-		}
+		console.log(options);
+		query.skip(options.skip ?? 0);
+		query.take(options.take ?? 0);
 	}
 
 	private applyDefaultSelect(query: SelectQueryBuilder<DataStoreEntity>): void {