diff --git a/lib/events.js b/lib/events.js
index 41c902be5905be..0ec374bc814497 100644
--- a/lib/events.js
+++ b/lib/events.js
@@ -850,7 +850,7 @@ function listenerCount(type, listener) {
 
     if (typeof evlistener === 'function') {
       if (listener != null) {
-        return listener === evlistener ? 1 : 0;
+        return listener === evlistener || listener === evlistener.listener ? 1 : 0;
       }
 
       return 1;
diff --git a/test/parallel/test-events-listener-count-with-listener.js b/test/parallel/test-events-listener-count-with-listener.js
index 080ce6d704513e..1696cb1c902cb9 100644
--- a/test/parallel/test-events-listener-count-with-listener.js
+++ b/test/parallel/test-events-listener-count-with-listener.js
@@ -12,6 +12,18 @@ assert.strictEqual(EE.listenerCount('event'), 0);
 assert.strictEqual(EE.listenerCount('event', handler), 0);
 assert.strictEqual(EE.listenerCount('event', anotherHandler), 0);
 
+EE.once('event', handler);
+
+assert.strictEqual(EE.listenerCount('event'), 1);
+assert.strictEqual(EE.listenerCount('event', handler), 1);
+assert.strictEqual(EE.listenerCount('event', anotherHandler), 0);
+
+EE.removeAllListeners('event');
+
+assert.strictEqual(EE.listenerCount('event'), 0);
+assert.strictEqual(EE.listenerCount('event', handler), 0);
+assert.strictEqual(EE.listenerCount('event', anotherHandler), 0);
+
 EE.on('event', handler);
 
 assert.strictEqual(EE.listenerCount('event'), 1);