diff --git a/internal/core/src/index/ScalarIndexSort.cpp b/internal/core/src/index/ScalarIndexSort.cpp
index 8d55832b1d..f53966bf43 100644
--- a/internal/core/src/index/ScalarIndexSort.cpp
+++ b/internal/core/src/index/ScalarIndexSort.cpp
@@ -97,7 +97,7 @@ ScalarIndexSort<T>::BuildWithFieldData(
         total_num_rows_ += data->get_num_rows();
         length += data->get_num_rows() - data->get_null_count();
     }
-    if (length == 0) {
+    if (total_num_rows_ == 0) {
         PanicInfo(DataIsEmpty, "ScalarIndexSort cannot build null values!");
     }
 
diff --git a/tests/python_client/testcases/test_search.py b/tests/python_client/testcases/test_search.py
index 2890c02b6d..7567b14225 100644
--- a/tests/python_client/testcases/test_search.py
+++ b/tests/python_client/testcases/test_search.py
@@ -12786,7 +12786,6 @@ class TestCollectionSearchNoneAndDefaultData(TestcaseBase):
                                                            default_float_field_name]})
 
     @pytest.mark.tags(CaseLabel.L2)
-    @pytest.mark.skip(reason="issue #36184")
     def test_search_after_none_data_all_field_datatype(self, varchar_scalar_index, numeric_scalar_index,
                                                        null_data_percent, _async):
         """