diff --git a/go/host/enclave/guardian.go b/go/host/enclave/guardian.go
index aff234a4ae..00ec097763 100644
--- a/go/host/enclave/guardian.go
+++ b/go/host/enclave/guardian.go
@@ -182,9 +182,9 @@ func (g *Guardian) HandleBatch(batch *common.ExtBatch) {
 }
 
 func (g *Guardian) HandleTransaction(tx common.EncryptedTx) {
-	if !g.state.IsUpToDate() {
-		g.logger.Info("Enclave is not up-to-date, dropping received transaction.")
-		return // ignore transactions until we're up-to-date
+	if g.GetEnclaveState().status == Disconnected || g.GetEnclaveState().status == Unavailable {
+		g.logger.Info("Enclave is not ready yet, dropping transaction.")
+		return // ignore transactions when enclave unavailable
 	}
 	resp, sysError := g.enclaveClient.SubmitTx(tx)
 	if sysError != nil {