diff --git a/server/core/session.c b/server/core/session.c
index 9a437aaca..860d98209 100644
--- a/server/core/session.c
+++ b/server/core/session.c
@@ -780,6 +780,10 @@ sessionRowCallback(RESULTSET *set, void *data)
         row = cbdata->row;
         cbdata->row = NULL;
     }
+    else
+    {
+        MXS_FREE(cbdata);
+    }
 
     return row;
 }