diff --git a/resources/views/account/address-edit.blade.php b/resources/views/account/address-edit.blade.php
index 4f3f2ca5..ae14c345 100644
--- a/resources/views/account/address-edit.blade.php
+++ b/resources/views/account/address-edit.blade.php
@@ -8,7 +8,7 @@
     <x-rapidez-ct::sections>
         <graphql
             query="{ customer { addresses { id firstname middlename lastname street city postcode country_code telephone company vat_id default_billing default_shipping } } }"
-            check="customer?.addresses.find(a => a.id == {{ request()->id }})"
+            check="(data) => data.customer?.addresses.find(a => a.id == {{ request()->id }})"
             redirect="{{ route('account.edit') }}"
         >
             <div v-if="data && data?.customer?.addresses" slot-scope="{ data }">
diff --git a/resources/views/account/order.blade.php b/resources/views/account/order.blade.php
index 3e9226dc..b6005ce2 100644
--- a/resources/views/account/order.blade.php
+++ b/resources/views/account/order.blade.php
@@ -19,7 +19,7 @@
 @section('account-content')
     <graphql
         query='@include('rapidez::account.partials.queries.order')'
-        check="customer.orders.items[0]"
+        check="(data) => data.customer.orders.items[0]"
         :callback="async (variables, response) => {return await updateOrder(variables, {data: response.data.customer.orders.items})}"
     >
         <div slot-scope="{ order: data }" v-if="order">
diff --git a/resources/views/account/partials/order/order-total.blade.php b/resources/views/account/partials/order/order-total.blade.php
index a0b10bd7..f76c7a6d 100644
--- a/resources/views/account/partials/order/order-total.blade.php
+++ b/resources/views/account/partials/order/order-total.blade.php
@@ -1,6 +1,6 @@
 <graphql
     query='@include('rapidez::account.partials.queries.order')'
-    check="customer.orders.items[0]"
+    check="(data) => data.customer.orders.items[0]"
     cache="orderdetail{{ $id }}"
 >
     <x-rapidez-ct::card v-if="data" slot-scope="{ data }">