diff --git a/app/Http/Controllers/Api/Ekosistem/ValueBasisDataController.php b/app/Http/Controllers/Api/Ekosistem/ValueBasisDataController.php
index d2134cc..2990981 100644
--- a/app/Http/Controllers/Api/Ekosistem/ValueBasisDataController.php
+++ b/app/Http/Controllers/Api/Ekosistem/ValueBasisDataController.php
@@ -92,6 +92,7 @@ class ValueBasisDataController extends Controller
                     MAX(
                         CASE 
                             WHEN kolom_id = {$k->id} 
+                            AND value_enum IS NOT NULL
                             THEN (
                                 SELECT elem->>'label'
                                 FROM ekosistem_basis_data_kolom k,
diff --git a/app/Http/Controllers/Web/Ekosistem/ValueBasisDataController.php b/app/Http/Controllers/Web/Ekosistem/ValueBasisDataController.php
index ce3e301..57b90bf 100644
--- a/app/Http/Controllers/Web/Ekosistem/ValueBasisDataController.php
+++ b/app/Http/Controllers/Web/Ekosistem/ValueBasisDataController.php
@@ -97,6 +97,7 @@ class ValueBasisDataController extends Controller
                     MAX(
                         CASE 
                             WHEN kolom_id = {$k->id} 
+                            AND value_enum IS NOT NULL
                             THEN (
                                 SELECT elem->>'label'
                                 FROM ekosistem_basis_data_kolom k,