diff --git a/app/Http/Controllers/HealthCareSheetController.php b/app/Http/Controllers/HealthCareSheetController.php
index 0cc504f..4a2b95c 100755
--- a/app/Http/Controllers/HealthCareSheetController.php
+++ b/app/Http/Controllers/HealthCareSheetController.php
@@ -1159,7 +1159,7 @@ class HealthCareSheetController extends Controller
             if (!empty($beneficiary_id)) {
                 $query = $query->where('beneficiary_id', $beneficiary_id);
             } else {
-                if ($state != 'ALL') {
+                if (!in_array($state, ['ALL', 'UNTREATED'])) {
                     $query = $query->whereNull('beneficiary_id');
                 }
             }