diff --git a/apps/console/src/pages/organizations/cookie-banners/configuration/cookies/_components/CategorySection.tsx b/apps/console/src/pages/organizations/cookie-banners/configuration/cookies/_components/CategorySection.tsx
index 3c380197d..eca86048d 100644
--- a/apps/console/src/pages/organizations/cookie-banners/configuration/cookies/_components/CategorySection.tsx
+++ b/apps/console/src/pages/organizations/cookie-banners/configuration/cookies/_components/CategorySection.tsx
@@ -154,8 +154,8 @@ export function CategorySection({ categoryKey, onDelete }: CategorySectionProps)
 
   const [updateCategory, isUpdating]
     = useMutation<CategorySectionUpdateMutation>(updateCategoryMutation);
-  const [moveCookie] =
-    useMutation<CategorySectionMoveCookieMutation>(moveCookieMutation);
+  const [moveCookie]
+    = useMutation<CategorySectionMoveCookieMutation>(moveCookieMutation);
 
   const [isEditingCategory, setIsEditingCategory] = useState(false);
   const [editingCookieIndex, setEditingCookieIndex] = useState<number | null>(null);
diff --git a/pkg/cookiebanner/service.go b/pkg/cookiebanner/service.go
index d0e2b20df..e1ac444ca 100644
--- a/pkg/cookiebanner/service.go
+++ b/pkg/cookiebanner/service.go
@@ -920,13 +920,14 @@ type MoveCookieToCategoryResult struct {
 
 func (s *Service) MoveCookieToCategory(
 	ctx context.Context,
-	scope coredata.Scoper,
 	req MoveCookieToCategoryRequest,
 ) (*MoveCookieToCategoryResult, error) {
 	if err := req.Validate(); err != nil {
 		return nil, fmt.Errorf("invalid request: %w", err)
 	}
 
+	scope := coredata.NewScopeFromObjectID(req.SourceCookieCategoryID)
+
 	var result MoveCookieToCategoryResult
 
 	err := s.pg.WithTx(
diff --git a/pkg/server/api/console/v1/cookie_banner_resolvers.go b/pkg/server/api/console/v1/cookie_banner_resolvers.go
index 5f7b851d1..e7951ea63 100644
--- a/pkg/server/api/console/v1/cookie_banner_resolvers.go
+++ b/pkg/server/api/console/v1/cookie_banner_resolvers.go
@@ -522,11 +522,8 @@ func (r *mutationResolver) MoveCookieToCategory(ctx context.Context, input types
 		return nil, err
 	}
 
-	scope := coredata.NewScopeFromObjectID(input.SourceCookieCategoryID)
-
 	result, err := r.cookieBanner.MoveCookieToCategory(
 		ctx,
-		scope,
 		cookiebanner.MoveCookieToCategoryRequest{
 			SourceCookieCategoryID: input.SourceCookieCategoryID,
 			TargetCookieCategoryID: input.TargetCookieCategoryID,
@@ -540,7 +537,7 @@ func (r *mutationResolver) MoveCookieToCategory(ctx context.Context, input types
 		case errors.Is(err, cookiebanner.ErrCookieNotFound):
 			return nil, gqlutils.NotFound(ctx, err)
 		case errors.Is(err, cookiebanner.ErrCategoriesBannerMismatch):
-			return nil, gqlutils.Invalidf(ctx, "source and target categories must belong to the same banner")
+			return nil, gqlutils.NotFoundf(ctx, "source or target category not found")
 		default:
 			if validationErrors, ok := errors.AsType[validator.ValidationErrors](err); ok {
 				return nil, gqlutils.InvalidValidationErrors(ctx, validationErrors)