diff --git a/app/module/bookmarks/bookmarks.module.go b/app/module/bookmarks/bookmarks.module.go
index 0590cff..cb46a41 100644
--- a/app/module/bookmarks/bookmarks.module.go
+++ b/app/module/bookmarks/bookmarks.module.go
@@ -1,7 +1,6 @@
 package bookmarks
 
 import (
-	"netidhub-saas-be/app/middleware"
 	"netidhub-saas-be/app/module/bookmarks/controller"
 	"netidhub-saas-be/app/module/bookmarks/repository"
 	"netidhub-saas-be/app/module/bookmarks/service"
@@ -49,9 +48,6 @@ func (_i *BookmarksRouter) RegisterBookmarksRoutes() {
 
 	// define routes
 	_i.App.Route("/bookmarks", func(router fiber.Router) {
-		// Add user middleware to extract user level from JWT token
-		router.Use(middleware.UserMiddleware(_i.UsersRepo))
-
 		// Public routes (require authentication)
 		router.Get("/", bookmarksController.All)
 		router.Get("/:id", bookmarksController.Show)
diff --git a/app/module/bookmarks/repository/bookmarks.repository.go b/app/module/bookmarks/repository/bookmarks.repository.go
index c279ab7..86fe75f 100644
--- a/app/module/bookmarks/repository/bookmarks.repository.go
+++ b/app/module/bookmarks/repository/bookmarks.repository.go
@@ -4,6 +4,7 @@ import (
 	"netidhub-saas-be/app/database"
 	"netidhub-saas-be/app/database/entity"
 	"netidhub-saas-be/app/module/bookmarks/request"
+	"netidhub-saas-be/config/config"
 	"netidhub-saas-be/utils/paginator"
 
 	"github.com/google/uuid"
@@ -13,6 +14,7 @@ import (
 type bookmarksRepository struct {
 	DB  *database.Database
 	Log zerolog.Logger
+	Cfg *config.Config
 }
 
 // BookmarksRepository define interface of IBookmarksRepository
@@ -27,10 +29,11 @@ type BookmarksRepository interface {
 	CountByUserId(clientId *uuid.UUID, userId uint) (count int64, err error)
 }
 
-func NewBookmarksRepository(db *database.Database, log zerolog.Logger) BookmarksRepository {
+func NewBookmarksRepository(db *database.Database, log zerolog.Logger, cfg *config.Config) BookmarksRepository {
 	return &bookmarksRepository{
 		DB:  db,
 		Log: log,
+		Cfg: cfg,
 	}
 }
 
@@ -41,7 +44,7 @@ func (_i *bookmarksRepository) GetAll(clientId *uuid.UUID, req request.Bookmarks
 	query := _i.DB.DB.Model(&entity.Bookmarks{}).Preload("User").Preload("Article")
 
 	// Apply client filter
-	if clientId != nil {
+	if clientId != nil && _i.Cfg.App.PrimaryClientKey != clientId.String() {
 		query = query.Where("client_id = ?", clientId)
 	}