diff --git a/src/cond-w.c b/src/cond-w.c
index b1a891d7..889beaa0 100644
--- a/src/cond-w.c
+++ b/src/cond-w.c
@@ -270,6 +270,12 @@ int cond_update(const char *name)
 
 		affects++;
 		dbg("%s: match <%s> %s(%s)", name ?: "nil", svc->cond, svc->desc, svc->cmd);
+		/* Fix bug #314: race condition between crashing services and conditions */
+		if (svc_is_restart(svc) && cond_get_agg(svc->cond) == COND_OFF) {
+			dbg("%s: cancel timer & unblock => WAITING state.", name ?: "nil");
+			service_timeout_cancel(svc);
+			svc_unblock(svc);
+		}
 		service_step(svc);
 	}
 
diff --git a/src/svc.h b/src/svc.h
index e0f54a3a..16572d58 100644
--- a/src/svc.h
+++ b/src/svc.h
@@ -263,6 +263,7 @@ static inline int  svc_is_blocked  (svc_t *svc) { return svc && svc->block != SV
 static inline int  svc_is_busy     (svc_t *svc) { return svc && svc->block == SVC_BLOCK_BUSY; }
 static inline int  svc_is_missing  (svc_t *svc) { return svc && svc->block == SVC_BLOCK_MISSING; }
 static inline int  svc_is_crashing (svc_t *svc) { return svc && svc->block == SVC_BLOCK_CRASHING; }
+static inline int  svc_is_restart  (svc_t *svc) { return svc && svc->block == SVC_BLOCK_RESTARTING; }
 
 static inline void svc_unblock     (svc_t *svc) { if (svc) svc->block = SVC_BLOCK_NONE;       }
 #define            svc_start(svc)  svc_unblock(svc)