diff --git a/server/core/buffer.c b/server/core/buffer.c
index cb10df951..fdf2f284f 100644
--- a/server/core/buffer.c
+++ b/server/core/buffer.c
@@ -339,7 +339,7 @@ GWBUF* gwbuf_clone(GWBUF* buf)
         while (clonebuf && buf->next)
         {
             buf = buf->next;
-            clonebuf->next = gwbuf_clone(buf);
+            clonebuf->next = gwbuf_clone_one(buf);
             clonebuf = clonebuf->next;
         }