diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc
index 2306fa8c359..565eaa69e03 100644
--- a/storage/tokudb/hatoku_hton.cc
+++ b/storage/tokudb/hatoku_hton.cc
@@ -602,6 +602,7 @@ static int tokudb_commit(handlerton * hton, THD * thd, bool all) {
             trx->sp_level = 0;
         }
         *txn = 0;
+        trx->sub_sp_level = NULL;
     } 
     else if (tokudb_debug & TOKUDB_DEBUG_TXN) {
         TOKUDB_TRACE("nothing to commit %d\n", all);
@@ -624,6 +625,7 @@ static int tokudb_rollback(handlerton * hton, THD * thd, bool all) {
             trx->sp_level = 0;
         }
         *txn = 0;
+        trx->sub_sp_level = NULL;
     } 
     else {
         if (tokudb_debug & TOKUDB_DEBUG_TXN) {