diff --git a/src/libanopa/exec_longrun.c b/src/libanopa/exec_longrun.c
index 0ef860b..485ab4f 100644
--- a/src/libanopa/exec_longrun.c
+++ b/src/libanopa/exec_longrun.c
@@ -46,7 +46,8 @@ _exec_longrun (int si, aa_mode mode)
     }
 
     if (s6_svstatus_read (aa_service_name (s), &st6)
-            && ((is_start && !!st6.pid) || (!is_start && !st6.pid)))
+            && ((is_start && (st6.pid && !st6.flagfinishing))
+                || (!is_start && !(st6.pid && !st6.flagfinishing))))
     {
         tain_now_g ();
 
diff --git a/src/libanopa/service.c b/src/libanopa/service.c
index fc26753..baece64 100644
--- a/src/libanopa/service.c
+++ b/src/libanopa/service.c
@@ -171,7 +171,7 @@ aa_ensure_service_loaded (int si, aa_mode mode, int no_wants, aa_load_fail_cb lf
             if (s6_svstatus_read (aa_service_name (aa_service (si)), &st6))
             {
                 chk_st = 0;
-                is_up = !!st6.pid;
+                is_up = st6.pid && !st6.flagfinishing;
             }
             tain_now_g ();
         }