diff --git a/gp-nested-forms/gpnf-sort-nested-form-entries.php b/gp-nested-forms/gpnf-sort-nested-form-entries.php
index 83995cc0e..342a8b536 100644
--- a/gp-nested-forms/gpnf-sort-nested-form-entries.php
+++ b/gp-nested-forms/gpnf-sort-nested-form-entries.php
@@ -115,8 +115,14 @@ public function output_script() {
 					}
 
 					return entries.sort((a, b) => {
-						let valA = a[sortFieldId]?.label || '';
-						let valB = b[sortFieldId]?.label || '';
+						let valA, valB;
+						if (isDateField) {
+							valA = a[sortFieldId]?.value || '';
+							valB = b[sortFieldId]?.value || '';
+						} else {
+							valA = a[sortFieldId]?.label || '';
+							valB = b[sortFieldId]?.label || '';
+						}
 
 						if (isDateField) {
 							const dateA = new Date(valA);