diff --git a/src/node.js b/src/node.js
index 29a390758f..6599a2ae74 100644
--- a/src/node.js
+++ b/src/node.js
@@ -366,11 +366,14 @@
         }
       }
 
-
       // Then run through all items in the asyncQueue
       if (asyncQueue) {
         for (i = 0; i < asyncQueue.length; i++) {
           queueItem = asyncQueue[i];
+          // Quick way to check if an AL instance with the same uid was
+          // already run from currentContext.
+          if (data[queueItem.uid] !== undefined)
+            continue;
           queue[queue.length] = queueItem;
           context._asyncFlags |= queueItem.flags;
           if ((queueItem.flags & HAS_CREATE_AL) === 0) {
@@ -519,12 +522,13 @@
       }
 
       this.uid = ++alUid;
-      this.data = data;
+      this.data = data === undefined ? null : data;
     }
     AsyncListenerInst.prototype.create = undefined;
     AsyncListenerInst.prototype.before = undefined;
     AsyncListenerInst.prototype.after = undefined;
     AsyncListenerInst.prototype.error = undefined;
+    AsyncListenerInst.prototype.data = undefined;
     AsyncListenerInst.prototype.uid = 0;
     AsyncListenerInst.prototype.flags = 0;
 
diff --git a/test/simple/test-asynclistener-run-inst-once.js b/test/simple/test-asynclistener-run-inst-once.js
new file mode 100644
index 0000000000..167473be34
--- /dev/null
+++ b/test/simple/test-asynclistener-run-inst-once.js
@@ -0,0 +1,45 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+
+var cntr = 0;
+var al = process.createAsyncListener({
+  create: function() { cntr++; },
+});
+
+process.on('exit', function() {
+  assert.equal(cntr, 4);
+  console.log('ok');
+});
+
+process.addAsyncListener(al);
+
+process.nextTick(function() {
+  process.addAsyncListener(al);
+  process.nextTick(function() {
+    process.addAsyncListener(al);
+    process.nextTick(function() {
+      process.nextTick(function() { });
+    });
+  });
+});