diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index ced5c7738f..61a4ffdf91 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -6,6 +6,8 @@ release, see :doc:`upgrade-notes`.
 
 Unreleased
 ==========
+* Set co.paralleluniverse.fibers.verifyInstrumentation=true in devMode.
+
 * Node will now gracefully fail to start if one of the required ports is already in use.
 
 * Node will now gracefully fail to start if ``devMode`` is true and ``compatibilityZoneURL`` is specified.
diff --git a/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt b/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
index e5b4835aeb..47db47e03a 100644
--- a/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
+++ b/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
@@ -203,6 +203,7 @@ abstract class AbstractNode(val configuration: NodeConfiguration,
     open fun start(): StartedNode<AbstractNode> {
         check(started == null) { "Node has already been started" }
         if (configuration.devMode) {
+            System.setProperty("co.paralleluniverse.fibers.verifyInstrumentation", "true")
             Emoji.renderIfSupported { Node.printWarning("This node is running in developer mode! ${Emoji.developer} This is not safe for production deployment.") }
         }
         log.info("Node starting up ...")