diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f94f0ec..95377934 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+- Use `withOwnerId` directive on `searchOrderForm` query.
+
 ## [2.162.0] - 2023-05-23
 
 ### Fixed
diff --git a/graphql/schema.graphql b/graphql/schema.graphql
index 21758f06..2d5b4b37 100644
--- a/graphql/schema.graphql
+++ b/graphql/schema.graphql
@@ -308,15 +308,17 @@ type Query {
   """
   returns a certain checkout cart details
   """
-  searchOrderForm(orderFormId: String!): OrderForm @cacheControl(scope: PRIVATE)
+  searchOrderForm(orderFormId: String!): OrderForm
+    @cacheControl(scope: PRIVATE)
+    @withOwnerId
 
   """
   DEPRECATED
   """
-  orders: [Order] @cacheControl(scope: PRIVATE) @withOrderFormId
-    @deprecated(
-      reason: "Use orders endpoint of vtex.orders-graphql instead"
-    )
+  orders: [Order]
+    @cacheControl(scope: PRIVATE)
+    @withOrderFormId
+    @deprecated(reason: "Use orders endpoint of vtex.orders-graphql instead")
 
   """
   Returns a specified user order
@@ -614,7 +616,11 @@ type Mutation {
         reason: "Field is no longer needed. Checkout cookie is automatically taken into account now"
       )
     items: [OrderFormItemInput]
-  ): OrderForm @withSegment @withOrderFormId @withOwnerId @cacheControl(scope: PRIVATE)
+  ): OrderForm
+    @withSegment
+    @withOrderFormId
+    @withOwnerId
+    @cacheControl(scope: PRIVATE)
 
   """
   Used to update the CL entity on masterData.