From 06189588d9af3bc426d77f7700971de947d7e503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=87etin?=
 <69278826+cetincakiroglu@users.noreply.github.com>
Date: Fri, 1 Dec 2023 15:27:26 +0300
Subject: [PATCH] Fixed #13773

---
 src/app/components/utils/objectutils.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/components/utils/objectutils.ts b/src/app/components/utils/objectutils.ts
index ae5dbf6bf09..87f7f7307c9 100644
--- a/src/app/components/utils/objectutils.ts
+++ b/src/app/components/utils/objectutils.ts
@@ -190,8 +190,12 @@ export class ObjectUtils {
 
     public static sort(value1, value2, order = 1, locale, nullSortOrder = 1) {
         const result = ObjectUtils.compare(value1, value2, locale, order);
+        let finalSortOrder = order;
+
         // nullSortOrder == 1 means Excel like sort nulls at bottom
-        const finalSortOrder = nullSortOrder === 1 ? order : nullSortOrder;
+        if (ObjectUtils.isEmpty(value1) || ObjectUtils.isEmpty(value2)) {
+            finalSortOrder = nullSortOrder === 1 ? order : nullSortOrder;
+        }
 
         return finalSortOrder * result;
     }