diff --git a/src/aof.c b/src/aof.c
index b0852c47f8b31c04a2b98fbcb55b9c24d6301217..5c051e05b7916ee789c38ab30c4a362f2a3449b3 100644
--- a/src/aof.c
+++ b/src/aof.c
@@ -657,6 +657,11 @@ void backgroundRewriteDoneHandler(int statloc) {
             if (server.appendfsync != APPENDFSYNC_NO) aof_fsync(fd);
             server.appendseldb = -1; /* Make sure it will issue SELECT */
             redisLog(REDIS_NOTICE,"The new append only file was selected for future appends.");
+
+            /* Clear regular AOF buffer since its contents was just written to
+             * the new AOF from the background rewrite buffer. */
+            sdsfree(server.aofbuf);
+            server.aofbuf = sdsempty();
         } else {
             /* If append only is disabled we just generate a dump in this
              * format. Why not? */