From c7d1010ce316695de8a37d0aaaf92641fe2d8dad Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 21 Aug 2023 17:49:54 +0100
Subject: [PATCH] Fix resetting sort column when sort column doesn't exist in
 schema whenever schema is yet to be loaded

---
 packages/frontend-core/src/components/grid/stores/sort.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/stores/sort.js b/packages/frontend-core/src/components/grid/stores/sort.js
index 9b2dbfb8df..734a876eed 100644
--- a/packages/frontend-core/src/components/grid/stores/sort.js
+++ b/packages/frontend-core/src/components/grid/stores/sort.js
@@ -31,10 +31,10 @@ export const initialise = context => {
   const sortColumnExists = derived(
     [sort, definition],
     ([$sort, $definition]) => {
-      if (!$sort?.column) {
+      if (!$sort?.column || !$definition) {
         return true
       }
-      return $definition?.schema?.[$sort.column] != null
+      return $definition.schema?.[$sort.column] != null
     }
   )