diff --git a/marketplace-service/src/main/java/com/axonivy/market/controller/FeedbackController.java b/marketplace-service/src/main/java/com/axonivy/market/controller/FeedbackController.java
index b51fc5d14..baddfcc05 100644
--- a/marketplace-service/src/main/java/com/axonivy/market/controller/FeedbackController.java
+++ b/marketplace-service/src/main/java/com/axonivy/market/controller/FeedbackController.java
@@ -105,9 +105,6 @@ public ResponseEntity<FeedbackModel> findFeedbackByUserIdAndProductId(
       @RequestParam("productId") @Parameter(description = "Product id (from meta.json)", example = "portal",
           in = ParameterIn.QUERY) String productId) {
     Feedback feedback = feedbackService.findFeedbackByUserIdAndProductId(userId, productId);
-    if (feedback == null) {
-      return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
     return new ResponseEntity<>(feedbackModelAssembler.toModel(feedback), HttpStatus.OK);
   }
 
diff --git a/marketplace-service/src/main/java/com/axonivy/market/enums/ErrorCode.java b/marketplace-service/src/main/java/com/axonivy/market/enums/ErrorCode.java
index 0bdb8fcdf..1cc8e5088 100644
--- a/marketplace-service/src/main/java/com/axonivy/market/enums/ErrorCode.java
+++ b/marketplace-service/src/main/java/com/axonivy/market/enums/ErrorCode.java
@@ -19,7 +19,8 @@ public enum ErrorCode {
   GITHUB_USER_NOT_FOUND("2204", "GITHUB_USER_NOT_FOUND"), GITHUB_USER_UNAUTHORIZED("2205", "GITHUB_USER_UNAUTHORIZED"),
   FEEDBACK_NOT_FOUND("3103", "FEEDBACK_NOT_FOUND"), NO_FEEDBACK_OF_USER_FOR_PRODUCT("3103",
       "NO_FEEDBACK_OF_USER_FOR_PRODUCT"), ARGUMENT_BAD_REQUEST("4000", "ARGUMENT_BAD_REQUEST"),
-  MAVEN_VERSION_SYNC_FAILED("1104","PRODUCT_MAVEN_SYNCED_FAILED");
+  MAVEN_VERSION_SYNC_FAILED("1104","PRODUCT_MAVEN_SYNCED_FAILED"), FEEDBACK_SORT_INVALID("3102",
+      "FEEDBACK_SORT_INVALID");
 
   String code;
   String helpText;
diff --git a/marketplace-service/src/main/java/com/axonivy/market/enums/FeedbackSortOption.java b/marketplace-service/src/main/java/com/axonivy/market/enums/FeedbackSortOption.java
new file mode 100644
index 000000000..8d25dde2a
--- /dev/null
+++ b/marketplace-service/src/main/java/com/axonivy/market/enums/FeedbackSortOption.java
@@ -0,0 +1,36 @@
+package com.axonivy.market.enums;
+
+import com.axonivy.market.exceptions.model.InvalidParamException;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.domain.Sort;
+
+import java.util.List;
+
+@Getter
+@AllArgsConstructor
+public enum FeedbackSortOption {
+  NEWEST("newest", "updatedAt rating _id",
+      List.of(Sort.Direction.DESC, Sort.Direction.DESC, Sort.Direction.ASC)),
+  OLDEST("oldest", "updatedAt rating _id",
+      List.of(Sort.Direction.ASC, Sort.Direction.DESC, Sort.Direction.ASC)),
+  HIGHEST("highest", "rating updatedAt _id",
+      List.of(Sort.Direction.DESC, Sort.Direction.DESC, Sort.Direction.ASC)),
+  LOWEST("lowest", "rating updatedAt _id",
+      List.of(Sort.Direction.ASC, Sort.Direction.DESC, Sort.Direction.ASC));
+
+  private final String option;
+  private final String code;
+  private final List<Sort.Direction> directions;
+
+  public static FeedbackSortOption of(String option) {
+    option = StringUtils.isBlank(option) ? option : option.trim();
+    for (var feedbackSortOption : values()) {
+      if (StringUtils.equalsIgnoreCase(feedbackSortOption.option, option)) {
+        return feedbackSortOption;
+      }
+    }
+    throw new InvalidParamException(ErrorCode.FEEDBACK_SORT_INVALID, "FeedbackSortOption: " + option);
+  }
+}
diff --git a/marketplace-service/src/main/java/com/axonivy/market/service/impl/FeedbackServiceImpl.java b/marketplace-service/src/main/java/com/axonivy/market/service/impl/FeedbackServiceImpl.java
index 3ae807b26..7d98bd0ce 100644
--- a/marketplace-service/src/main/java/com/axonivy/market/service/impl/FeedbackServiceImpl.java
+++ b/marketplace-service/src/main/java/com/axonivy/market/service/impl/FeedbackServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.axonivy.market.entity.Feedback;
 import com.axonivy.market.enums.ErrorCode;
+import com.axonivy.market.enums.FeedbackSortOption;
 import com.axonivy.market.exceptions.model.NoContentException;
 import com.axonivy.market.exceptions.model.NotFoundException;
 import com.axonivy.market.model.FeedbackModelRequest;
@@ -12,9 +13,12 @@
 import com.axonivy.market.service.FeedbackService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -37,7 +41,7 @@ public FeedbackServiceImpl(FeedbackRepository feedbackRepository, UserRepository
   @Override
   public Page<Feedback> findFeedbacks(String productId, Pageable pageable) throws NotFoundException {
     validateProductExists(productId);
-    return feedbackRepository.searchByProductId(productId, pageable);
+    return feedbackRepository.searchByProductId(productId, refinePagination(pageable));
   }
 
   @Override
@@ -112,4 +116,31 @@ public void validateUserExists(String userId) {
       throw new NotFoundException(ErrorCode.USER_NOT_FOUND, "Not found user with id: " + userId);
     }
   }
+
+  private Pageable refinePagination(Pageable pageable) {
+    PageRequest pageRequest = (PageRequest) pageable;
+    if (pageable != null) {
+      List<Sort.Order> orders = new ArrayList<>();
+      for (var sort : pageable.getSort()) {
+        FeedbackSortOption feedbackSortOption = FeedbackSortOption.of(sort.getProperty());
+        List<Sort.Order> order = createOrder(feedbackSortOption);
+        orders.addAll(order);
+      }
+      pageRequest = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), Sort.by(orders));
+    }
+    return pageRequest;
+  }
+
+  public List<Sort.Order> createOrder(FeedbackSortOption feedbackSortOption) {
+    String[] fields = feedbackSortOption.getCode().split(StringUtils.SPACE);
+    List<Sort.Direction> directions = feedbackSortOption.getDirections();
+
+    if (fields.length != directions.size()) {
+      throw new IllegalArgumentException("The number of fields and directions must match.");
+    }
+
+    return IntStream.range(0, fields.length)
+        .mapToObj(i -> new Sort.Order(directions.get(i), fields[i]))
+        .toList();
+  }
 }
diff --git a/marketplace-ui/src/app/auth/auth.service.spec.ts b/marketplace-ui/src/app/auth/auth.service.spec.ts
index c55faf239..8d7b07fe9 100644
--- a/marketplace-ui/src/app/auth/auth.service.spec.ts
+++ b/marketplace-ui/src/app/auth/auth.service.spec.ts
@@ -6,6 +6,7 @@ import { AuthService } from './auth.service';
 import { environment } from '../../environments/environment';
 import { of } from 'rxjs';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { TOKEN_KEY } from '../shared/constants/common.constant';
 
 describe('AuthService', () => {
   let service: AuthService;
@@ -70,7 +71,7 @@ describe('AuthService', () => {
     service['handleTokenResponse'](token, state);
 
     expect(cookieServiceSpy.set).toHaveBeenCalledWith(
-      service['TOKEN_KEY'],
+      TOKEN_KEY,
       token,
       {expires: jasmine.any(Number), path: '/'}
     );
diff --git a/marketplace-ui/src/app/auth/auth.service.ts b/marketplace-ui/src/app/auth/auth.service.ts
index 6655c0b59..9b766daf0 100644
--- a/marketplace-ui/src/app/auth/auth.service.ts
+++ b/marketplace-ui/src/app/auth/auth.service.ts
@@ -5,6 +5,7 @@ import { Router } from '@angular/router';
 import { catchError, Observable, throwError } from 'rxjs';
 import { CookieService } from 'ngx-cookie-service';
 import { jwtDecode } from 'jwt-decode';
+import { TOKEN_KEY } from '../shared/constants/common.constant';
 
 export interface TokenPayload {
   username: string;
@@ -26,7 +27,6 @@ export interface TokenResponse {
 })
 export class AuthService {
   private readonly BASE_URL = environment.apiUrl;
-  private readonly TOKEN_KEY = 'token';
   private readonly githubAuthUrl = 'https://github.com/login/oauth/authorize';
   private readonly githubAuthCallbackUrl = window.location.origin + environment.githubAuthCallbackPath;
 
@@ -66,14 +66,14 @@ export class AuthService {
   }
 
   private setTokenAsCookie(token: string): void {
-    this.cookieService.set(this.TOKEN_KEY, token, {
+    this.cookieService.set(TOKEN_KEY, token, {
       expires: this.extractNumberOfExpiredDay(token),
       path: '/'
     });
   }
 
   getToken(): string | null {
-    const token = this.cookieService.get(this.TOKEN_KEY);
+    const token = this.cookieService.get(TOKEN_KEY);
     if (token && !this.isTokenExpired(token)) {
       return token;
     }
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-detail-feedback.component.spec.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-detail-feedback.component.spec.ts
index 2f372eb57..628d0ad0a 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-detail-feedback.component.spec.ts
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-detail-feedback.component.spec.ts
@@ -1,12 +1,8 @@
 import {
   ComponentFixture,
-  TestBed,
-  fakeAsync,
-  tick
-} from '@angular/core/testing';
+  TestBed} from '@angular/core/testing';
 import { ProductDetailFeedbackComponent } from './product-detail-feedback.component';
 import { ProductStarRatingPanelComponent } from './product-star-rating-panel/product-star-rating-panel.component';
-import { ShowFeedbacksDialogComponent } from './show-feedbacks-dialog/show-feedbacks-dialog.component';
 import { ProductFeedbacksPanelComponent } from './product-feedbacks-panel/product-feedbacks-panel.component';
 import { AppModalService } from '../../../../shared/services/app-modal.service';
 import { ActivatedRoute, Router } from '@angular/router';
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.html
index cb50ddcb5..cb26a6d70 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.html
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.html
@@ -5,7 +5,7 @@
   <div class="feedback-dropdown">
     <app-common-dropdown
       [items]="feedbackSortTypes"
-      [selectedItem]="selectedSortTypeLabel | translate"
+      [selectedItem]="selectedSortTypeLabel() | translate"
       buttonClass="form-select border-primary text-primary"
       ariaLabel="sort"
       (itemSelected)="onSortChange($event)">
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.spec.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.spec.ts
index ed33d05d4..970502176 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.spec.ts
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.spec.ts
@@ -7,24 +7,13 @@ import { FEEDBACK_SORT_TYPES } from '../../../../../../shared/constants/common.c
 import { By } from '@angular/platform-browser';
 import { CommonDropdownComponent } from '../../../../../../shared/components/common-dropdown/common-dropdown.component';
 import { ItemDropdown } from '../../../../../../shared/models/item-dropdown.model';
-import { TypeOption } from '../../../../../../shared/enums/type-option.enum';
-import { SortOption } from '../../../../../../shared/enums/sort-option.enum';
 import { FeedbackSortType } from '../../../../../../shared/enums/feedback-sort-type';
-import { FeedbackFilterService } from './feedback-filter.service';
-import { Subject } from 'rxjs';
 
 describe('FeedbackFilterComponent', () => {
-  const mockEvent = {
-    value: FeedbackSortType.NEWEST,
-    label: 'common.sort.value.newest',
-    sortFn: 'updatedAt,desc'
-  } as ItemDropdown<FeedbackSortType>;
-
   let component: FeedbackFilterComponent;
   let fixture: ComponentFixture<FeedbackFilterComponent>;
   let translateService: jasmine.SpyObj<TranslateService>;
   let productFeedbackService: jasmine.SpyObj<ProductFeedbackService>;
-  let feedbackFilterService: FeedbackFilterService;
 
   beforeEach(async () => {
     const productFeedbackServiceSpy = jasmine.createSpyObj('ProductFeedbackService', ['sort']);
@@ -32,14 +21,6 @@ describe('FeedbackFilterComponent', () => {
     await TestBed.configureTestingModule({
       imports: [FeedbackFilterComponent, FormsModule, TranslateModule.forRoot() ],
       providers: [
-        {
-          provide: FeedbackFilterService,
-          useValue: {
-            event$: new Subject(),
-            data: null,
-            changeSortByLabel: jasmine.createSpy('changeSortByLabel')
-          }
-        },
         TranslateService,
         { provide: ProductFeedbackService, useValue: productFeedbackServiceSpy }
       ]
@@ -48,7 +29,6 @@ describe('FeedbackFilterComponent', () => {
 
     translateService = TestBed.inject(TranslateService) as jasmine.SpyObj<TranslateService>;
     productFeedbackService = TestBed.inject(ProductFeedbackService) as jasmine.SpyObj<ProductFeedbackService>;
-    feedbackFilterService = TestBed.inject(FeedbackFilterService);
   });
 
   beforeEach(() => {
@@ -68,7 +48,7 @@ describe('FeedbackFilterComponent', () => {
 
   it('should pass the correct selected item to the dropdown', () => {
     const dropdownComponent = fixture.debugElement.query(By.directive(CommonDropdownComponent)).componentInstance;
-    expect(dropdownComponent.selectedItem).toBe(component.selectedSortTypeLabel);
+    expect(dropdownComponent.selectedItem).toBe(component.selectedSortTypeLabel());
   });
 
   it('should call onSortChange when an item is selected', () => {
@@ -87,31 +67,4 @@ describe('FeedbackFilterComponent', () => {
     const dropdownComponent = fixture.debugElement.query(By.directive(CommonDropdownComponent)).componentInstance;
     expect(dropdownComponent.items).toBe(component.feedbackSortTypes);
   });
-
-  it('should emit sortChange event when onSortChange is called', () => {
-    spyOn(component.sortChange, 'emit');
-    component.onSortChange(mockEvent);
-    expect(component.sortChange.emit).toHaveBeenCalledWith(mockEvent.sortFn);
-  });
-
-  it('should listen to feedbackFilterService event$ and call changeSortByLabel', () => {
-    spyOn(component, 'changeSortByLabel').and.callThrough();
-    component.ngOnInit(); // Subscribes to event$
-    (feedbackFilterService.event$ as Subject<any>).next(mockEvent); // Trigger the event
-    expect(component.changeSortByLabel).toHaveBeenCalledWith(mockEvent);
-  });
-
-  it('should NOT call changeSortByLabel if feedbackFilterService.data does not exist', () => {
-    feedbackFilterService.data = undefined;
-    spyOn(component, 'changeSortByLabel');
-    component.ngOnInit()
-    expect(component.changeSortByLabel).not.toHaveBeenCalled();
-  });
-
-  it('should call changeSortByLabel if feedbackFilterService.data exists', () => {
-    feedbackFilterService.data = mockEvent;
-    spyOn(component, 'changeSortByLabel');
-    component.ngOnInit()
-    expect(component.changeSortByLabel).toHaveBeenCalledWith(mockEvent);
-  });
 });
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.ts
index bf62bf80f..d7d3e97b6 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.ts
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.component.ts
@@ -1,4 +1,11 @@
-import { Component, EventEmitter, inject, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  computed,
+  EventEmitter,
+  inject,
+  Output,
+  Signal
+} from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { FEEDBACK_SORT_TYPES } from '../../../../../../shared/constants/common.constant';
 import { FormsModule } from '@angular/forms';
@@ -8,7 +15,6 @@ import { CommonDropdownComponent } from '../../../../../../shared/components/com
 import { CommonUtils } from '../../../../../../shared/utils/common.utils';
 import { ItemDropdown } from '../../../../../../shared/models/item-dropdown.model';
 import { FeedbackSortType } from '../../../../../../shared/enums/feedback-sort-type';
-import { FeedbackFilterService } from './feedback-filter.service';
 
 @Component({
   selector: 'app-feedback-filter',
@@ -17,36 +23,22 @@ import { FeedbackFilterService } from './feedback-filter.service';
   templateUrl: './feedback-filter.component.html',
   styleUrl: './feedback-filter.component.scss'
 })
-export class FeedbackFilterComponent implements OnInit {
+export class FeedbackFilterComponent {
   feedbackSortTypes = FEEDBACK_SORT_TYPES;
 
   @Output() sortChange = new EventEmitter<string>();
 
-  feedbackFilterService = inject(FeedbackFilterService);
-
   productFeedbackService = inject(ProductFeedbackService);
   languageService = inject(LanguageService);
-  selectedSortTypeLabel: string = CommonUtils.getLabel(FEEDBACK_SORT_TYPES[0].value, FEEDBACK_SORT_TYPES);
-
-  ngOnInit() {
-    if (this.feedbackFilterService.data) {
-      this.changeSortByLabel(this.feedbackFilterService.data);
-    }
-    this.feedbackFilterService.event$.subscribe(event => {
-      this.changeSortByLabel(event);
-    });
-  }
+  selectedSortTypeLabel: Signal<string> = computed(() =>
+    CommonUtils.getLabel(
+      this.productFeedbackService.sort(),
+      FEEDBACK_SORT_TYPES
+    )
+  );
 
   onSortChange(event: ItemDropdown<FeedbackSortType>): void {
-    this.changeSortByLabel(event);
-    this.sortChange.emit(event.sortFn);
-    this.feedbackFilterService.changeSortByLabel(event);
-  }
-
-  changeSortByLabel(event: ItemDropdown<FeedbackSortType>): void {
-    this.selectedSortTypeLabel = CommonUtils.getLabel(
-      event.value,
-      FEEDBACK_SORT_TYPES
-    );
+    this.productFeedbackService.sort.set(event.value);
+    this.sortChange.emit(event.value);
   }
 }
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.service.spec.ts.js b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.service.spec.ts.js
deleted file mode 100644
index 067c84334..000000000
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.service.spec.ts.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { FeedbackFilterService } from './feedback-filter.service';
-
-describe('FeedbackFilterService', () => {
-  let service: FeedbackFilterService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(FeedbackFilterService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-
-  it('should have undefined data initially', () => {
-    expect(service.data).toBeUndefined();
-  });
-
-  it('should update data and emit the value through event$', () => {
-    const mockData = { value: 'test', label: 'Test Label' };
-
-    // Spy on the next method of the Subject (sortBySubject)
-    spyOn(service['sortBySubject'], 'next').and.callThrough();
-
-    // Subscribe to the event$ observable to listen for changes
-    let emittedValue: any;
-    service.event$.subscribe(value => emittedValue = value);
-
-    // Call the changeSortByLabel function
-    service.changeSortByLabel(mockData);
-
-    // Expect the data to be updated
-    expect(service.data).toEqual(mockData);
-
-    // Expect the next method to have been called with the correct value
-    expect(service['sortBySubject'].next).toHaveBeenCalledWith(mockData);
-
-    // Expect the emitted value to match the mockData
-    expect(emittedValue).toEqual(mockData);
-  });
-});
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.service.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.service.ts
deleted file mode 100644
index 31dfbfd28..000000000
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/feedback-filter/feedback-filter.service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Subject } from 'rxjs';
-import { ItemDropdown } from '../../../../../../shared/models/item-dropdown.model';
-import { FeedbackSortType } from '../../../../../../shared/enums/feedback-sort-type';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class FeedbackFilterService {
-  private readonly sortBySubject = new Subject<ItemDropdown<FeedbackSortType>>();
-  data: ItemDropdown<FeedbackSortType> | undefined;
-  event$ = this.sortBySubject.asObservable();
-
-  changeSortByLabel(data: ItemDropdown<FeedbackSortType>) {
-    this.data = data;
-    this.sortBySubject.next(data);
-  }
-}
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.spec.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.spec.ts
index 87ee61820..df7abd888 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.spec.ts
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.spec.ts
@@ -69,7 +69,7 @@ describe('ProductFeedbackService', () => {
     productDetailService.productId.and.returnValue('123');
 
     service.initFeedbacks();
-    const req = httpMock.expectOne('api/feedback/product/123?page=0&size=8&sort=updatedAt,desc');
+    const req = httpMock.expectOne('api/feedback/product/123?page=0&size=8&sort=newest');
     expect(req.request.method).toBe('GET');
     req.flush(mockResponse);
 
@@ -88,22 +88,19 @@ describe('ProductFeedbackService', () => {
   
     productDetailService.productId.and.returnValue('123');
     service.initFeedbacks();
-    const initReq = httpMock.expectOne('api/feedback/product/123?page=0&size=8&sort=updatedAt,desc');
+    const initReq = httpMock.expectOne('api/feedback/product/123?page=0&size=8&sort=newest');
     initReq.flush({ _embedded: { feedbacks: initialFeedback }, page: { totalPages: 2, totalElements: 5 } });
   
     service.loadMoreFeedbacks();
-    const loadMoreReq = httpMock.expectOne('api/feedback/product/123?page=1&size=8&sort=updatedAt,desc');
-    loadMoreReq.flush({ _embedded: { feedbacks: additionalFeedback }, page: { totalPages: 2, totalElements: 5 } });
+    const loadMoreReq = httpMock.expectOne('api/feedback/product/123?page=1&size=8&sort=newest');
+    loadMoreReq.flush({ _embedded: { feedbacks: additionalFeedback } });
 
     expect(service.feedbacks()).toEqual([...initialFeedback, ...additionalFeedback]);
   });
 
   it('should change sort and fetch feedbacks', () => {
     const mockResponse = {
-      _embedded: {
-        feedbacks: [{ content: 'Sorting test', rating: 3, productId: '123' }]
-      },
-      page: { totalPages: 2, totalElements: 5 }
+      _embedded: { feedbacks: [{ content: 'Sorting test', rating: 3, productId: '123' }] }
     };
 
     productDetailService.productId.and.returnValue('123');
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.ts
index fed7d4895..f1b14518b 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.ts
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.ts
@@ -11,13 +11,23 @@ import {
   signal,
   WritableSignal
 } from '@angular/core';
-import { BehaviorSubject, catchError, concatMap, EMPTY, Observable, of, tap } from 'rxjs';
+import { catchError, EMPTY, Observable, of, tap } from 'rxjs';
+import { CookieService } from 'ngx-cookie-service';
 import { AuthService } from '../../../../../auth/auth.service';
-import { ForwardingError, SkipLoading } from '../../../../../core/interceptors/api.interceptor';
+import {
+  ForwardingError,
+  SkipLoading
+} from '../../../../../core/interceptors/api.interceptor';
 import { FeedbackApiResponse } from '../../../../../shared/models/apis/feedback-response.model';
 import { Feedback } from '../../../../../shared/models/feedback.model';
 import { ProductDetailService } from '../../product-detail.service';
 import { ProductStarRatingService } from '../product-star-rating-panel/product-star-rating.service';
+import {
+  FEEDBACK_SORT_TYPES,
+  NOT_FOUND_ERROR_CODE,
+  TOKEN_KEY,
+  USER_NOT_FOUND_ERROR_CODE
+} from '../../../../../shared/constants/common.constant';
 
 const FEEDBACK_API_URL = 'api/feedback';
 const SIZE = 8;
@@ -29,14 +39,9 @@ export class ProductFeedbackService {
   private readonly productDetailService = inject(ProductDetailService);
   private readonly productStarRatingService = inject(ProductStarRatingService);
   private readonly http = inject(HttpClient);
-  private readonly feedbackRequestQueue$ = new BehaviorSubject<{
-    productId: string;
-    page: number;
-    sort: string;
-    size: number;
-  } | null>(null);
+  private readonly cookieService = inject(CookieService);
 
-  sort: WritableSignal<string> = signal('updatedAt,desc');
+  sort: WritableSignal<string> = signal(FEEDBACK_SORT_TYPES[0].value);
   page: WritableSignal<number> = signal(0);
 
   userFeedback: WritableSignal<Feedback | null> = signal(null);
@@ -51,25 +56,6 @@ export class ProductFeedbackService {
   totalPages: WritableSignal<number> = signal(1);
   totalElements: WritableSignal<number> = signal(0);
 
-  constructor() {
-    this.feedbackRequestQueue$
-      .pipe(
-        concatMap(requestParams => {
-          if (requestParams) {
-            return this.executeFindProductFeedbacksByCriteria(
-              requestParams.productId,
-              requestParams.page,
-              requestParams.sort,
-              requestParams.size
-            );
-          } else {
-            return EMPTY;
-          }
-        })
-      )
-      .subscribe();
-  }
-
   submitFeedback(feedback: Feedback): Observable<Feedback> {
     const headers = new HttpHeaders().set(
       'X-Authorization',
@@ -78,13 +64,24 @@ export class ProductFeedbackService {
     return this.http
       .post<Feedback>(FEEDBACK_API_URL, feedback, {
         headers,
-        context: new HttpContext().set(SkipLoading, true).set(ForwardingError, true)
+        context: new HttpContext()
+          .set(SkipLoading, true)
+          .set(ForwardingError, true)
       })
       .pipe(
         tap(() => {
           this.initFeedbacks();
           this.findProductFeedbackOfUser().subscribe();
           this.productStarRatingService.fetchData();
+        }),
+        catchError(response => {
+          if (
+            response.status === NOT_FOUND_ERROR_CODE &&
+            response.error.helpCode === USER_NOT_FOUND_ERROR_CODE
+          ) {
+            this.clearTokenCookie();
+          }
+          return EMPTY;
         })
       );
   }
@@ -94,15 +91,6 @@ export class ProductFeedbackService {
     page: number = this.page(),
     sort: string = this.sort(),
     size: number = SIZE
-  ): void {
-    this.feedbackRequestQueue$.next({ productId, page, sort, size });
-  }
-
-  private executeFindProductFeedbacksByCriteria(
-    productId: string = this.productDetailService.productId(),
-    page: number = this.page(),
-    sort: string = this.sort(),
-    size: number = SIZE
   ): Observable<FeedbackApiResponse> {
     const requestParams = new HttpParams()
       .set('page', page.toString())
@@ -112,17 +100,18 @@ export class ProductFeedbackService {
     return this.http
       .get<FeedbackApiResponse>(requestURL, {
         params: requestParams,
-        context: new HttpContext().set(SkipLoading, true).set(ForwardingError, true)
+        context: new HttpContext().set(SkipLoading, true)
       })
       .pipe(
         tap(response => {
-          this.totalPages.set(response.page.totalPages);
-          this.totalElements.set(response.page.totalElements);
-          this.feedbacks.set([...this.feedbacks(), ...response._embedded.feedbacks]);
-        }),
-        catchError((e) => {
-          console.log(e);
-          return EMPTY;
+          if (page === 0) {
+            this.feedbacks.set(response._embedded.feedbacks);
+          } else {
+            this.feedbacks.set([
+              ...this.feedbacks(),
+              ...response._embedded.feedbacks
+            ]);
+          }
         })
       );
   }
@@ -133,16 +122,25 @@ export class ProductFeedbackService {
     const params = new HttpParams()
       .set('productId', productId)
       .set('userId', this.authService.getUserId() ?? '');
+    const requestURL = FEEDBACK_API_URL;
     return this.http
-      .get<Feedback>(FEEDBACK_API_URL, {
+      .get<Feedback>(requestURL, {
         params,
-        context: new HttpContext().set(SkipLoading, true).set(ForwardingError, true)
+        context: new HttpContext()
+          .set(SkipLoading, true)
+          .set(ForwardingError, true)
       })
       .pipe(
         tap(feedback => {
           this.userFeedback.set(feedback);
         }),
-        catchError(() => {
+        catchError(response => {
+          if (
+            response.status === NOT_FOUND_ERROR_CODE &&
+            response.error.helpCode === USER_NOT_FOUND_ERROR_CODE
+          ) {
+            this.clearTokenCookie();
+          }
           const feedback: Feedback = {
             content: '',
             rating: 0,
@@ -156,18 +154,24 @@ export class ProductFeedbackService {
 
   initFeedbacks(): void {
     this.page.set(0);
-    this.findProductFeedbacksByCriteria();
+    this.findProductFeedbacksByCriteria().subscribe(response => {
+      this.totalPages.set(response.page.totalPages);
+      this.totalElements.set(response.page.totalElements);
+    });
   }
 
   loadMoreFeedbacks(): void {
     this.page.update(value => value + 1);
-    this.findProductFeedbacksByCriteria();
+    this.findProductFeedbacksByCriteria().subscribe();
   }
 
   changeSort(newSort: string): void {
-    this.feedbacks.set([]);
     this.page.set(0);
     this.sort.set(newSort);
-    this.findProductFeedbacksByCriteria();
+    this.findProductFeedbacksByCriteria().subscribe();
+  }
+
+  private clearTokenCookie(): void {
+    this.cookieService.delete(TOKEN_KEY);
   }
 }
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/success-dialog/success-dialog.component.spec.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/success-dialog/success-dialog.component.spec.ts
index ad37b8d65..9229d0c7a 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/success-dialog/success-dialog.component.spec.ts
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/add-feedback-dialog/success-dialog/success-dialog.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { SuccessDialogComponent } from './success-dialog.component';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { TranslateModule } from '@ngx-translate/core';
 import { AuthService } from '../../../../../../../auth/auth.service';
 import { NgOptimizedImage } from '@angular/common';
 
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.html
index 159c8879a..cdb23c305 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.html
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.html
@@ -191,7 +191,7 @@ <h4 class="analysis-title text-primary text-capitalize mb-0">
     </div>
   </div>
   <hr />
-  <div class="default-cursor" style="margin-bottom: 8rem">
+  <div class="default-cursor" style="margin-bottom: 12.8rem">
     @if (productDetail() && productFeedbackService.totalElements() > 0) {
       <app-product-detail-feedback [isMobileMode]="isMobileMode()" />
     } @else {
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
index afb527116..510714de9 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts
@@ -142,6 +142,7 @@ export class ProductDetailComponent {
   ngOnInit(): void {
     this.router.navigate([], {
       relativeTo: this.route,
+      queryParamsHandling: 'merge',
       replaceUrl: true
     });
 
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-star-rating-number/product-star-rating-number.component.spec.ts b/marketplace-ui/src/app/modules/product/product-detail/product-star-rating-number/product-star-rating-number.component.spec.ts
index 41244dcba..ebe2f7f1a 100644
--- a/marketplace-ui/src/app/modules/product/product-detail/product-star-rating-number/product-star-rating-number.component.spec.ts
+++ b/marketplace-ui/src/app/modules/product/product-detail/product-star-rating-number/product-star-rating-number.component.spec.ts
@@ -6,7 +6,6 @@ import { ProductStarRatingService } from '../product-detail-feedback/product-sta
 import { AuthService } from '../../../../auth/auth.service';
 import { ProductDetailService } from '../product-detail.service';
 import { By } from '@angular/platform-browser';
-import { of } from 'rxjs';
 
 describe('ProductStarRatingNumberComponent', () => {
   let component: ProductStarRatingNumberComponent;
diff --git a/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.spec.ts b/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.spec.ts
index e6318a701..3feb7c9df 100644
--- a/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.spec.ts
+++ b/marketplace-ui/src/app/modules/product/product-filter/product-filter.component.spec.ts
@@ -5,7 +5,6 @@ import { By } from '@angular/platform-browser';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { ProductFilterComponent } from './product-filter.component';
 import { Viewport } from 'karma-viewport/dist/adapter/viewport';
-import { MatomoRouterModule } from 'ngx-matomo-client';
 
 declare const viewport: Viewport;
 
diff --git a/marketplace-ui/src/app/shared/constants/common.constant.ts b/marketplace-ui/src/app/shared/constants/common.constant.ts
index 5c51e0e8f..97ece80d0 100644
--- a/marketplace-ui/src/app/shared/constants/common.constant.ts
+++ b/marketplace-ui/src/app/shared/constants/common.constant.ts
@@ -148,23 +148,19 @@ export const PRODUCT_DETAIL_TABS: ItemDropdown[] = [
 export const FEEDBACK_SORT_TYPES: ItemDropdown<FeedbackSortType>[] = [
   {
     value: FeedbackSortType.NEWEST,
-    label: 'common.sort.value.newest',
-    sortFn: 'updatedAt,desc'
+    label: 'common.sort.value.newest'
   },
   {
     value: FeedbackSortType.OLDEST,
-    label: 'common.sort.value.oldest',
-    sortFn: 'updatedAt,asc'
+    label: 'common.sort.value.oldest'
   },
   {
     value: FeedbackSortType.HIGHEST,
-    label: 'common.sort.value.highest',
-    sortFn: 'rating,desc'
+    label: 'common.sort.value.highest'
   },
   {
     value: FeedbackSortType.LOWEST,
-    label: 'common.sort.value.lowest',
-    sortFn: 'rating,asc'
+    label: 'common.sort.value.lowest'
   }
 ];
 
@@ -193,12 +189,14 @@ export const ERROR_PAGE = 'Error Page';
 export const ERROR_PAGE_PATH = 'error-page';
 export const NOT_FOUND_ERROR_CODE = 404;
 export const INTERNAL_SERVER_ERROR_CODE = 500;
+export const USER_NOT_FOUND_ERROR_CODE = 2103; 
 export const UNDEFINED_ERROR_CODE = 0;
 export const ERROR_CODES = [
   UNDEFINED_ERROR_CODE,
   NOT_FOUND_ERROR_CODE,
   INTERNAL_SERVER_ERROR_CODE
 ];
+export const TOKEN_KEY = 'token';
 
 export const DEFAULT_IMAGE_URL = '/assets/images/misc/axonivy-logo-round.png';
 export const DOWNLOAD_URL = 'https://developer.axonivy.com/download';
diff --git a/marketplace-ui/src/app/shared/models/item-dropdown.model.ts b/marketplace-ui/src/app/shared/models/item-dropdown.model.ts
index a21aa83ab..95be60d7e 100644
--- a/marketplace-ui/src/app/shared/models/item-dropdown.model.ts
+++ b/marketplace-ui/src/app/shared/models/item-dropdown.model.ts
@@ -3,7 +3,6 @@ export interface ItemDropdown<T extends string = string> {
   tabId?: string,
   value: T;
   label: string;
-  sortFn?: string;
 
   // for Artifact model
   name?: string;