diff --git a/js/make-a-ten/common/model/PaperNumber.js b/js/make-a-ten/common/model/PaperNumber.js
index 0e09f50..7dcd95d 100644
--- a/js/make-a-ten/common/model/PaperNumber.js
+++ b/js/make-a-ten/common/model/PaperNumber.js
@@ -57,10 +57,10 @@ define( function( require ) {
     this.baseNumbers = PaperNumber.getBaseNumbers( this.numberValueProperty.value );
 
     // @public {Emitter} - Fires when the user stops dragging a paper number.
-    this.endDragEmitter = new Emitter( { validationEnabled: false } );
+    this.endDragEmitter = new Emitter( { validators: [ { valueType: PaperNumber } ] } );
 
     // @public {Emitter} - Fires when the animation towards our destination ends (we hit our destination).
-    this.endAnimationEmitter = new Emitter( { validationEnabled: false } );
+    this.endAnimationEmitter = new Emitter( { validators: [ { valueType: PaperNumber } ] } );
   }
 
   makeATen.register( 'PaperNumber', PaperNumber );
diff --git a/js/make-a-ten/common/view/PaperNumberNode.js b/js/make-a-ten/common/view/PaperNumberNode.js
index 3e35ab3..eca8f7c 100644
--- a/js/make-a-ten/common/view/PaperNumberNode.js
+++ b/js/make-a-ten/common/view/PaperNumberNode.js
@@ -38,13 +38,13 @@ define( function( require ) {
     this.paperNumber = paperNumber;
 
     // @public {Emitter} - Triggered with self when this paper number node starts to get dragged
-    this.moveEmitter = new Emitter( { validationEnabled: false } );
+    this.moveEmitter = new Emitter( { validators: [ { valueType: PaperNumberNode } ] } );
 
     // @public {Emitter} - Triggered with self when this paper number node is split
-    this.splitEmitter = new Emitter( { validationEnabled: false } );
+    this.splitEmitter = new Emitter( { validators: [ { valueType: PaperNumberNode } ] } );
 
     // @public {Emitter} - Triggered when user interaction with this paper number begins.
-    this.interactionStartedEmitter = new Emitter( { validationEnabled: false } );
+    this.interactionStartedEmitter = new Emitter( { validators: [ { valueType: PaperNumberNode } ] } );
 
     // @private {boolean} - When true, don't emit from the moveEmitter (synthetic drag)
     this.preventMoveEmit = false;