diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 5534cdde596..6c7282c3505 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -2361,10 +2361,6 @@ void THD::cleanup_after_query()
     rgi_slave->cleanup_after_query();
 #endif
 
-#ifdef WITH_WSREP
-  wsrep_free_status(this);
-#endif /* WITH_WSREP */
-
   DBUG_VOID_RETURN;
 }
 
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc
index a3366000fc5..7e64b654c92 100644
--- a/sql/wsrep_var.cc
+++ b/sql/wsrep_var.cc
@@ -567,6 +567,11 @@ static void export_wsrep_status_to_mysql(THD* thd)
 {
   int wsrep_status_len, i;
 
+  if (thd->wsrep_status_vars)
+  {
+    wsrep->stats_free(wsrep, thd->wsrep_status_vars);
+  }
+
   thd->wsrep_status_vars = wsrep->stats_get(wsrep);
 
   if (!thd->wsrep_status_vars) {