diff --git a/app/module/bookmarks/repository/bookmarks.repository.go b/app/module/bookmarks/repository/bookmarks.repository.go
index 0c4b8ce..1165dd2 100644
--- a/app/module/bookmarks/repository/bookmarks.repository.go
+++ b/app/module/bookmarks/repository/bookmarks.repository.go
@@ -43,15 +43,13 @@ func (_i *bookmarksRepository) GetAll(clientId *uuid.UUID, req request.Bookmarks
 
 	query := _i.DB.DB.Model(&entity.Bookmarks{}).Preload("Article")
 
+	query = query.Where("user_id = ?", *req.UserId)
+
 	// Apply client filter
 	if clientId != nil && _i.Cfg.App.PrimaryClientKey != clientId.String() {
 		query = query.Where("client_id = ?", clientId)
 	}
 
-	if req.UserId != nil {
-		query = query.Where("user_id = ?", *req.UserId)
-	}
-
 	if req.ArticleId != nil {
 		query = query.Where("article_id = ?", *req.ArticleId)
 	}