diff --git a/node-daemon/pvc-flush.service b/node-daemon/pvc-flush.service
index aef39771..36c71be1 100644
--- a/node-daemon/pvc-flush.service
+++ b/node-daemon/pvc-flush.service
@@ -9,9 +9,10 @@ PartOf = pvcd.target
 Type = oneshot
 RemainAfterExit = true
 WorkingDirectory = /usr/share/pvc
-ExecPreStart = /bin/sleep 10
-ExecStart = /usr/bin/pvc node unflush
+ExecPreStart = /bin/sleep 30
+ExecStart = /usr/bin/pvc node unflush --wait
 ExecStop = /usr/bin/pvc node flush --wait
+ExecPostStop = /bin/sleep 30
 
 [Install]
 WantedBy = pvcd.target