diff --git a/src/jrd/svc.h b/src/jrd/svc.h
index a37b0a64f2..10f6eb8436 100644
--- a/src/jrd/svc.h
+++ b/src/jrd/svc.h
@@ -134,7 +134,8 @@ public:		// utilities interface with service
 
 	virtual bool finished() 
 	{
-		return (svc_flags & (SVC_finished | SVC_detached)) != 0;
+		return ((svc_flags & (SVC_finished | SVC_detached)) != 0)
+			|| checkForShutdown();
 	}
 
 public:		// external interface with service