diff --git a/htdocs/app/Http/Controllers/DokterController.php b/htdocs/app/Http/Controllers/DokterController.php
index 8ec53320..53970f77 100644
--- a/htdocs/app/Http/Controllers/DokterController.php
+++ b/htdocs/app/Http/Controllers/DokterController.php
@@ -819,7 +819,7 @@ class DokterController extends Controller
 			return 6;
 		}
 
-		if (str_starts_with($normalized, 'otor maldi (un verified)')) {
+		if (str_starts_with($normalized, 'otor maldi (un verified)') || str_starts_with($normalized, 'expertise saved (un verified)')) {
 			return 7;
 		}
 
@@ -835,8 +835,7 @@ class DokterController extends Controller
 			return 10;
 		}
 
-		if (str_starts_with($normalized, 'expertise saved (un verified)')
-			|| in_array($normalized, ['expertise', 'selesai', 'final result'], true)) {
+		if (in_array($normalized, ['expertise', 'selesai', 'final result'], true)) {
 			return 11;
 		}
 
diff --git a/htdocs/app/Services/AstmMessageService.php b/htdocs/app/Services/AstmMessageService.php
index ef73230f..fc848b9d 100644
--- a/htdocs/app/Services/AstmMessageService.php
+++ b/htdocs/app/Services/AstmMessageService.php
@@ -147,7 +147,7 @@ class AstmMessageService
             return 6;
         }
 
-        if (str_starts_with($normalized, 'otor maldi (un verified)')) {
+        if (str_starts_with($normalized, 'otor maldi (un verified)') || str_starts_with($normalized, 'expertise saved (un verified)')) {
             return 7;
         }
 
@@ -163,8 +163,7 @@ class AstmMessageService
             return 10;
         }
 
-        if (str_starts_with($normalized, 'expertise saved (un verified)')
-            || in_array($normalized, ['expertise', 'selesai', 'final result'], true)) {
+        if (in_array($normalized, ['expertise', 'selesai', 'final result'], true)) {
             return 11;
         }