diff --git a/src/server.c b/src/server.c
index 502589cf..ea61d15a 100644
--- a/src/server.c
+++ b/src/server.c
@@ -2519,7 +2519,8 @@ int processCommand(client *c) {
     if (((server.stop_writes_on_bgsave_err &&
           server.saveparamslen > 0 &&
           server.lastbgsave_status == C_ERR) ||
-          server.aof_last_write_status == C_ERR) &&
+          (server.aof_state != AOF_OFF &&
+           server.aof_last_write_status == C_ERR)) &&
         server.masterhost == NULL &&
         (c->cmd->flags & CMD_WRITE ||
          c->cmd->proc == pingCommand))