diff --git a/api/src/chat/controllers/block.controller.spec.ts b/api/src/chat/controllers/block.controller.spec.ts
index e56d186..403744b 100644
--- a/api/src/chat/controllers/block.controller.spec.ts
+++ b/api/src/chat/controllers/block.controller.spec.ts
@@ -48,13 +48,13 @@ import { BlockCreateDto, BlockUpdateDto } from '../dto/block.dto';
 import { BlockRepository } from '../repositories/block.repository';
 import { CategoryRepository } from '../repositories/category.repository';
 import { LabelRepository } from '../repositories/label.repository';
-import { BlockModel, Block } from '../schemas/block.schema';
+import { Block, BlockModel } from '../schemas/block.schema';
 import { LabelModel } from '../schemas/label.schema';
 import { BlockService } from '../services/block.service';
 import { CategoryService } from '../services/category.service';
 import { LabelService } from '../services/label.service';
 
-import { CategoryModel, Category } from './../schemas/category.schema';
+import { Category, CategoryModel } from './../schemas/category.schema';
 import { BlockController } from './block.controller';
 
 describe('BlockController', () => {
@@ -167,7 +167,7 @@ describe('BlockController', () => {
           blockFixture.name === 'hasNextBlocks' ? [hasPreviousBlocks.id] : [],
       }));
 
-      expect(blockService.find).toHaveBeenCalledWith({});
+      expect(blockService.find).toHaveBeenCalledWith({}, undefined);
       expect(result).toEqualPayload(blocksWithCategory, [
         ...IGNORED_TEST_FIELDS,
         'attachedToBlock',
@@ -187,7 +187,7 @@ describe('BlockController', () => {
           blockFixture.name === 'hasNextBlocks' ? [hasPreviousBlocks] : [],
       }));
 
-      expect(blockService.findAndPopulate).toHaveBeenCalledWith({});
+      expect(blockService.findAndPopulate).toHaveBeenCalledWith({}, undefined);
       expect(result).toEqualPayload(blocksWithCategory);
     });
   });
diff --git a/api/src/chat/controllers/block.controller.ts b/api/src/chat/controllers/block.controller.ts
index 47ef62f..fd59e8a 100644
--- a/api/src/chat/controllers/block.controller.ts
+++ b/api/src/chat/controllers/block.controller.ts
@@ -30,6 +30,8 @@ import { PluginName, PluginType } from '@/plugins/types';
 import { UserService } from '@/user/services/user.service';
 import { BaseController } from '@/utils/generics/base-controller';
 import { DeleteResult } from '@/utils/generics/base-repository';
+import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
+import { PageQueryPipe } from '@/utils/pagination/pagination-query.pipe';
 import { PopulatePipe } from '@/utils/pipes/populate.pipe';
 import { SearchFilterPipe } from '@/utils/pipes/search-filter.pipe';
 import { TFilterQuery } from '@/utils/types/filter.types';
@@ -63,23 +65,29 @@ export class BlockController extends BaseController<
   ) {
     super(blockService);
   }
+
   /**
    * Finds blocks based on the provided query parameters.
    * @param populate - An array of fields to populate in the returned blocks.
    * @param filters - Query filters to apply to the block search.
    * @returns A Promise that resolves to an array of found blocks.
    */
-
   @Get()
   async find(
     @Query(PopulatePipe)
     populate: string[],
     @Query(new SearchFilterPipe<Block>({ allowedFields: ['category'] }))
     filters: TFilterQuery<Block>,
+    @Query(PageQueryPipe) pageQuery?: PageQueryDto<Block>,
   ): Promise<Block[] | BlockFull[]> {
+    if (pageQuery?.limit) {
+      return this.canPopulate(populate)
+        ? await this.blockService.findPageAndPopulate(filters, pageQuery)
+        : await this.blockService.findPage(filters, pageQuery);
+    }
     return this.canPopulate(populate)
-      ? await this.blockService.findAndPopulate(filters)
-      : await this.blockService.find(filters);
+      ? await this.blockService.findAndPopulate(filters, pageQuery?.sort)
+      : await this.blockService.find(filters, pageQuery?.sort);
   }
 
   /**
diff --git a/api/src/chat/controllers/category.controller.ts b/api/src/chat/controllers/category.controller.ts
index 4d90fc3..ff4c322 100644
--- a/api/src/chat/controllers/category.controller.ts
+++ b/api/src/chat/controllers/category.controller.ts
@@ -57,7 +57,11 @@ export class CategoryController extends BaseController<Category> {
     @Query(new SearchFilterPipe<Category>({ allowedFields: ['label'] }))
     filters: TFilterQuery<Category>,
   ) {
-    return await this.categoryService.findPage(filters, pageQuery);
+    if (pageQuery.limit) {
+      return await this.categoryService.findPage(filters, pageQuery);
+    }
+
+    return await this.categoryService.find(filters, pageQuery.sort);
   }
 
   /**
diff --git a/api/src/chat/controllers/context-var.controller.ts b/api/src/chat/controllers/context-var.controller.ts
index 53db073..f03358e 100644
--- a/api/src/chat/controllers/context-var.controller.ts
+++ b/api/src/chat/controllers/context-var.controller.ts
@@ -60,7 +60,11 @@ export class ContextVarController extends BaseController<ContextVar> {
     @Query(new SearchFilterPipe<ContextVar>({ allowedFields: ['label'] }))
     filters: TFilterQuery<ContextVar>,
   ): Promise<ContextVar[]> {
-    return await this.contextVarService.findPage(filters, pageQuery);
+    if (pageQuery.limit) {
+      return await this.contextVarService.findPage(filters, pageQuery);
+    }
+
+    return await this.contextVarService.find(filters, pageQuery.sort);
   }
 
   /**
diff --git a/api/src/chat/controllers/label.controller.ts b/api/src/chat/controllers/label.controller.ts
index b5b76fa..2179e35 100644
--- a/api/src/chat/controllers/label.controller.ts
+++ b/api/src/chat/controllers/label.controller.ts
@@ -62,9 +62,15 @@ export class LabelController extends BaseController<
     @Query(new SearchFilterPipe<Label>({ allowedFields: ['name', 'title'] }))
     filters: TFilterQuery<Label>,
   ) {
+    if (pageQuery.limit) {
+      return this.canPopulate(populate)
+        ? await this.labelService.findPageAndPopulate(filters, pageQuery)
+        : await this.labelService.findPage(filters, pageQuery);
+    }
+
     return this.canPopulate(populate)
-      ? await this.labelService.findPageAndPopulate(filters, pageQuery)
-      : await this.labelService.findPage(filters, pageQuery);
+      ? await this.labelService.findAndPopulate(filters, pageQuery.sort)
+      : await this.labelService.find(filters, pageQuery.sort);
   }
 
   /**
diff --git a/api/src/chat/controllers/message.controller.ts b/api/src/chat/controllers/message.controller.ts
index dd7dce2..e9e04a4 100644
--- a/api/src/chat/controllers/message.controller.ts
+++ b/api/src/chat/controllers/message.controller.ts
@@ -42,6 +42,7 @@ import {
   MessageStub,
 } from '../schemas/message.schema';
 import {
+  AnyMessage,
   OutgoingMessage,
   OutgoingMessageFormat,
   StdOutgoingEnvelope,
@@ -71,7 +72,7 @@ export class MessageController extends BaseController<
 
   @Get()
   async findPage(
-    @Query(PageQueryPipe) pageQuery: PageQueryDto<Message>,
+    @Query(PageQueryPipe) pageQuery: PageQueryDto<AnyMessage>,
     @Query(PopulatePipe)
     populate: string[],
     @Query(
@@ -79,9 +80,15 @@ export class MessageController extends BaseController<
     )
     filters: TFilterQuery<Message>,
   ) {
+    if (pageQuery.limit) {
+      return this.canPopulate(populate)
+        ? await this.messageService.findPageAndPopulate(filters, pageQuery)
+        : await this.messageService.findPage(filters, pageQuery);
+    }
+
     return this.canPopulate(populate)
-      ? await this.messageService.findPageAndPopulate(filters, pageQuery)
-      : await this.messageService.findPage(filters, pageQuery);
+      ? await this.messageService.findAndPopulate(filters, pageQuery.sort)
+      : await this.messageService.find(filters, pageQuery.sort);
   }
 
   /**
diff --git a/api/src/chat/controllers/subscriber.controller.ts b/api/src/chat/controllers/subscriber.controller.ts
index 2b086e3..f5ab614 100644
--- a/api/src/chat/controllers/subscriber.controller.ts
+++ b/api/src/chat/controllers/subscriber.controller.ts
@@ -73,9 +73,15 @@ export class SubscriberController extends BaseController<
     )
     filters: TFilterQuery<Subscriber>,
   ) {
+    if (pageQuery.limit) {
+      return this.canPopulate(populate)
+        ? await this.subscriberService.findPageAndPopulate(filters, pageQuery)
+        : await this.subscriberService.findPage(filters, pageQuery);
+    }
+
     return this.canPopulate(populate)
-      ? await this.subscriberService.findPageAndPopulate(filters, pageQuery)
-      : await this.subscriberService.findPage(filters, pageQuery);
+      ? await this.subscriberService.findAndPopulate(filters, pageQuery.sort)
+      : await this.subscriberService.find(filters, pageQuery.sort);
   }
 
   /**
diff --git a/api/src/cms/controllers/content-type.controller.ts b/api/src/cms/controllers/content-type.controller.ts
index 34ccbda..05f0424 100644
--- a/api/src/cms/controllers/content-type.controller.ts
+++ b/api/src/cms/controllers/content-type.controller.ts
@@ -75,7 +75,11 @@ export class ContentTypeController extends BaseController<ContentType> {
     @Query(new SearchFilterPipe<ContentType>({ allowedFields: ['name'] }))
     filters: TFilterQuery<ContentType>,
   ) {
-    return await this.contentTypeService.findPage(filters, pageQuery);
+    if (pageQuery.limit) {
+      return await this.contentTypeService.findPage(filters, pageQuery);
+    }
+
+    return await this.contentTypeService.find(filters, pageQuery.sort);
   }
 
   /**
diff --git a/api/src/cms/controllers/content.controller.ts b/api/src/cms/controllers/content.controller.ts
index 72eaf9b..e7075d8 100644
--- a/api/src/cms/controllers/content.controller.ts
+++ b/api/src/cms/controllers/content.controller.ts
@@ -194,9 +194,14 @@ export class ContentController extends BaseController<
     )
     filters: TFilterQuery<Content>,
   ) {
+    if (pageQuery.limit) {
+      return this.canPopulate(populate)
+        ? await this.contentService.findPageAndPopulate(filters, pageQuery)
+        : await this.contentService.findPage(filters, pageQuery);
+    }
     return this.canPopulate(populate)
-      ? await this.contentService.findPageAndPopulate(filters, pageQuery)
-      : await this.contentService.findPage(filters, pageQuery);
+      ? await this.contentService.findAndPopulate(filters, pageQuery.sort)
+      : await this.contentService.find(filters, pageQuery.sort);
   }
 
   /**
diff --git a/api/src/cms/controllers/menu.controller.ts b/api/src/cms/controllers/menu.controller.ts
index a0f7d80..39c6e78 100644
--- a/api/src/cms/controllers/menu.controller.ts
+++ b/api/src/cms/controllers/menu.controller.ts
@@ -76,7 +76,11 @@ export class MenuController extends BaseController<
     @Query(new SearchFilterPipe<Menu>({ allowedFields: ['parent'] }))
     filters: TFilterQuery<Menu>,
   ) {
-    return await this.menuService.findPage(filters, pageQuery);
+    if (pageQuery.limit) {
+      return await this.menuService.findPage(filters, pageQuery);
+    }
+
+    return await this.menuService.find(filters, pageQuery.sort);
   }
 
   /**
diff --git a/api/src/i18n/controllers/language.controller.ts b/api/src/i18n/controllers/language.controller.ts
index 899ece7..1b0eaee 100644
--- a/api/src/i18n/controllers/language.controller.ts
+++ b/api/src/i18n/controllers/language.controller.ts
@@ -57,7 +57,11 @@ export class LanguageController extends BaseController<Language> {
     @Query(new SearchFilterPipe<Language>({ allowedFields: ['title', 'code'] }))
     filters: TFilterQuery<Language>,
   ) {
-    return await this.languageService.findPage(filters, pageQuery);
+    if (pageQuery.limit) {
+      return await this.languageService.findPage(filters, pageQuery);
+    }
+
+    return await this.languageService.find(filters, pageQuery.sort);
   }
 
   /**
diff --git a/api/src/i18n/controllers/translation.controller.ts b/api/src/i18n/controllers/translation.controller.ts
index b079583..2b97bee 100644
--- a/api/src/i18n/controllers/translation.controller.ts
+++ b/api/src/i18n/controllers/translation.controller.ts
@@ -55,7 +55,10 @@ export class TranslationController extends BaseController<Translation> {
     @Query(new SearchFilterPipe<Translation>({ allowedFields: ['str'] }))
     filters: TFilterQuery<Translation>,
   ) {
-    return await this.translationService.findPage(filters, pageQuery);
+    if (pageQuery.limit) {
+      return await this.translationService.findPage(filters, pageQuery);
+    }
+    return await this.translationService.find(filters, pageQuery.sort);
   }
 
   /**
diff --git a/api/src/nlp/controllers/nlp-entity.controller.ts b/api/src/nlp/controllers/nlp-entity.controller.ts
index d5066ec..8117a52 100644
--- a/api/src/nlp/controllers/nlp-entity.controller.ts
+++ b/api/src/nlp/controllers/nlp-entity.controller.ts
@@ -135,9 +135,15 @@ export class NlpEntityController extends BaseController<
     @Query(new SearchFilterPipe<NlpEntity>({ allowedFields: ['name', 'doc'] }))
     filters: TFilterQuery<NlpEntity>,
   ) {
+    if (pageQuery.limit) {
+      return this.canPopulate(populate)
+        ? await this.nlpEntityService.findPageAndPopulate(filters, pageQuery)
+        : await this.nlpEntityService.findPage(filters, pageQuery);
+    }
+
     return this.canPopulate(populate)
-      ? await this.nlpEntityService.findPageAndPopulate(filters, pageQuery)
-      : await this.nlpEntityService.findPage(filters, pageQuery);
+      ? await this.nlpEntityService.findAndPopulate(filters)
+      : await this.nlpEntityService.find(filters, pageQuery.sort);
   }
 
   /**
diff --git a/api/src/nlp/controllers/nlp-sample.controller.ts b/api/src/nlp/controllers/nlp-sample.controller.ts
index 492234a..59e8b97 100644
--- a/api/src/nlp/controllers/nlp-sample.controller.ts
+++ b/api/src/nlp/controllers/nlp-sample.controller.ts
@@ -280,9 +280,15 @@ export class NlpSampleController extends BaseController<
     )
     filters: TFilterQuery<NlpSample>,
   ) {
+    if (pageQuery.limit) {
+      return this.canPopulate(populate)
+        ? await this.nlpSampleService.findPageAndPopulate(filters, pageQuery)
+        : await this.nlpSampleService.findPage(filters, pageQuery);
+    }
+
     return this.canPopulate(populate)
-      ? await this.nlpSampleService.findPageAndPopulate(filters, pageQuery)
-      : await this.nlpSampleService.findPage(filters, pageQuery);
+      ? await this.nlpSampleService.findAndPopulate(filters, pageQuery.sort)
+      : await this.nlpSampleService.find(filters, pageQuery.sort);
   }
 
   /**
diff --git a/api/src/nlp/controllers/nlp-value.controller.ts b/api/src/nlp/controllers/nlp-value.controller.ts
index 80540c9..1ac86b4 100644
--- a/api/src/nlp/controllers/nlp-value.controller.ts
+++ b/api/src/nlp/controllers/nlp-value.controller.ts
@@ -146,9 +146,15 @@ export class NlpValueController extends BaseController<
     )
     filters: TFilterQuery<NlpValue>,
   ) {
+    if (pageQuery.limit) {
+      return this.canPopulate(populate)
+        ? await this.nlpValueService.findPageAndPopulate(filters, pageQuery)
+        : await this.nlpValueService.findPage(filters, pageQuery);
+    }
+
     return this.canPopulate(populate)
-      ? await this.nlpValueService.findPageAndPopulate(filters, pageQuery)
-      : await this.nlpValueService.findPage(filters, pageQuery);
+      ? await this.nlpValueService.findAndPopulate(filters, pageQuery.sort)
+      : await this.nlpValueService.find(filters, pageQuery.sort);
   }
 
   /**
diff --git a/api/src/user/controllers/role.controller.ts b/api/src/user/controllers/role.controller.ts
index 723c27a..d73d799 100644
--- a/api/src/user/controllers/role.controller.ts
+++ b/api/src/user/controllers/role.controller.ts
@@ -68,9 +68,15 @@ export class RoleController extends BaseController<
     @Query(new SearchFilterPipe<Role>({ allowedFields: ['name'] }))
     filters: TFilterQuery<Role>,
   ) {
+    if (pageQuery.limit) {
+      return this.canPopulate(populate)
+        ? await this.roleService.findPageAndPopulate(filters, pageQuery)
+        : await this.roleService.findPage(filters, pageQuery);
+    }
+
     return this.canPopulate(populate)
-      ? await this.roleService.findPageAndPopulate(filters, pageQuery)
-      : await this.roleService.findPage(filters, pageQuery);
+      ? await this.roleService.findAndPopulate(filters, pageQuery.sort)
+      : await this.roleService.find(filters, pageQuery.sort);
   }
 
   /**
diff --git a/api/src/user/controllers/user.controller.ts b/api/src/user/controllers/user.controller.ts
index a206ec7..ea46480 100644
--- a/api/src/user/controllers/user.controller.ts
+++ b/api/src/user/controllers/user.controller.ts
@@ -168,9 +168,15 @@ export class ReadOnlyUserController extends BaseController<
     )
     filters: TFilterQuery<User>,
   ) {
+    if (pageQuery.limit) {
+      return this.canPopulate(populate)
+        ? await this.userService.findPageAndPopulate(filters, pageQuery)
+        : await this.userService.findPage(filters, pageQuery);
+    }
+
     return this.canPopulate(populate)
-      ? await this.userService.findPageAndPopulate(filters, pageQuery)
-      : await this.userService.find(filters);
+      ? await this.userService.findAndPopulate(filters, pageQuery.sort)
+      : await this.userService.find(filters, pageQuery.sort);
   }
 
   /**
diff --git a/api/src/utils/pagination/pagination-query.dto.ts b/api/src/utils/pagination/pagination-query.dto.ts
index 1fbbd07..31ac2ec 100644
--- a/api/src/utils/pagination/pagination-query.dto.ts
+++ b/api/src/utils/pagination/pagination-query.dto.ts
@@ -16,7 +16,7 @@ export type QuerySortDto<T> = [
 ];
 
 export type PageQueryDto<T> = {
-  skip: number;
-  limit: number;
+  skip: number | undefined;
+  limit: number | undefined;
   sort: QuerySortDto<T>;
 };
diff --git a/api/src/utils/pagination/pagination-query.pipe.ts b/api/src/utils/pagination/pagination-query.pipe.ts
index 13a5cbd..c69076a 100644
--- a/api/src/utils/pagination/pagination-query.pipe.ts
+++ b/api/src/utils/pagination/pagination-query.pipe.ts
@@ -14,19 +14,21 @@ import { PageQueryDto } from './pagination-query.dto';
 
 const sortTypes = ['asc', 'desc'];
 
+export type PageQueryParams = { skip?: string; limit?: string; sort?: string };
+
 export class PageQueryPipe<T>
-  implements
-    PipeTransform<
-      { skip: string; limit: string; sort: string },
-      PageQueryDto<T>
-    >
+  implements PipeTransform<PageQueryParams, PageQueryDto<T>>
 {
-  transform(value: { skip: string; limit: string; sort: string }) {
-    const skip = parseInt(value.skip) > -1 ? parseInt(value.skip) : 0;
-    const limit =
-      parseInt(value.limit) > 0
-        ? parseInt(value.limit)
-        : config.pagination.limit;
+  transform(value: PageQueryParams) {
+    let skip: number | undefined = undefined;
+    let limit: number | undefined = undefined;
+    if ('limit' in value) {
+      skip = parseInt(value.skip) > -1 ? parseInt(value.skip) : 0;
+      limit =
+        parseInt(value.limit) > 0
+          ? parseInt(value.limit)
+          : config.pagination.limit;
+    }
     const [sortName = 'createdAt', sortType = 'desc'] =
       value.sort?.split(' ') || [];