diff --git a/src/core/operator_list.js b/src/core/operator_list.js
index b5690843dca68..0e1d550f73d81 100644
--- a/src/core/operator_list.js
+++ b/src/core/operator_list.js
@@ -525,6 +525,8 @@ var NullOptimizer = (function NullOptimizerClosure() {
     },
 
     flush() { },
+
+    reset() { },
   };
 
   return NullOptimizer;
@@ -538,7 +540,7 @@ var OperatorList = (function OperatorListClosure() {
     this.messageHandler = messageHandler;
     this.fnArray = [];
     this.argsArray = [];
-    if (messageHandler && this.intent !== 'oplist') {
+    if (messageHandler && intent !== 'oplist') {
       this.optimizer = new QueueOptimizer(this);
     } else {
       this.optimizer = new NullOptimizer(this);