diff --git a/writeengine/wrapper/writeengine.cpp b/writeengine/wrapper/writeengine.cpp
index a1e4fe7c8..727bdaf48 100644
--- a/writeengine/wrapper/writeengine.cpp
+++ b/writeengine/wrapper/writeengine.cpp
@@ -1177,7 +1177,7 @@ timer.stop("allocRowId");
 	//--------------------------------------------------------------------------
 	// Tokenize data if needed
 	//--------------------------------------------------------------------------
-   if (insertSelect)
+   if (insertSelect && isAutoCommitOn)
        BRMWrapper::setUseVb( false );
    else
        BRMWrapper::setUseVb( true );
@@ -1285,7 +1285,7 @@ timer.stop("tokenize");
          }
       }
    }
-   if (insertSelect)
+   if (insertSelect && isAutoCommitOn)
        BRMWrapper::setUseVb( false );
    else
 	   BRMWrapper::setUseVb( true );