diff --git a/common/src/main/java/io/netty/util/concurrent/DefaultPromise.java b/common/src/main/java/io/netty/util/concurrent/DefaultPromise.java
index fcacd61832..6586a615ea 100644
--- a/common/src/main/java/io/netty/util/concurrent/DefaultPromise.java
+++ b/common/src/main/java/io/netty/util/concurrent/DefaultPromise.java
@@ -567,9 +567,9 @@ public class DefaultPromise<V> extends AbstractFuture<V> implements Promise<V> {
                         final GenericFutureListener<? extends Future<V>> l =
                                 (GenericFutureListener<? extends Future<V>>) listeners;
                         notifyListener0(this, l);
-                        this.listeners = null;
                     }
                 } finally {
+                    this.listeners = null;
                     LISTENER_STACK_DEPTH.set(stackDepth);
                 }
                 return;
diff --git a/common/src/test/java/io/netty/util/concurrent/DefaultPromiseTest.java b/common/src/test/java/io/netty/util/concurrent/DefaultPromiseTest.java
index 519802c449..26f304b09f 100644
--- a/common/src/test/java/io/netty/util/concurrent/DefaultPromiseTest.java
+++ b/common/src/test/java/io/netty/util/concurrent/DefaultPromiseTest.java
@@ -19,8 +19,10 @@ package io.netty.util.concurrent;
 import org.junit.Test;
 
 import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -81,26 +83,9 @@ public class DefaultPromiseTest {
 
     @Test
     public void testListenerNotifyOrder() throws Exception {
-        SingleThreadEventExecutor executor =
-                new SingleThreadEventExecutor(null, Executors.defaultThreadFactory(), true) {
-                    @Override
-                    protected void run() {
-                        for (;;) {
-                            Runnable task = takeTask();
-                            if (task != null) {
-                                task.run();
-                                updateLastExecutionTime();
-                            }
-
-                            if (confirmShutdown()) {
-                                break;
-                            }
-                        }
-                    }
-                };
-
+        EventExecutor executor = new TestEventExecutor();
         final BlockingQueue<FutureListener<Void>> listeners = new LinkedBlockingQueue<FutureListener<Void>>();
-        int runs = 20000;
+        int runs = 100000;
 
         for (int i = 0; i < runs; i++) {
             final Promise<Void> promise = new DefaultPromise<Void>(executor);
@@ -148,4 +133,67 @@ public class DefaultPromiseTest {
         }
         executor.shutdownGracefully().sync();
     }
+
+    @Test
+    public void testListenerNotifyLater() throws Exception {
+        // Testing first execution path in DefaultPromise
+        testListenerNotifyLater(1);
+
+        // Testing second execution path in DefaultPromise
+        testListenerNotifyLater(2);
+    }
+
+    private static void testListenerNotifyLater(final int numListenersBefore) throws Exception {
+        EventExecutor executor = new TestEventExecutor();
+        int expectedCount = numListenersBefore + 2;
+        final CountDownLatch latch = new CountDownLatch(expectedCount);
+        final FutureListener<Void> listener = new FutureListener<Void>() {
+            @Override
+            public void operationComplete(Future<Void> future) throws Exception {
+                latch.countDown();
+            }
+        };
+        final Promise<Void> promise = new DefaultPromise<Void>(executor);
+        executor.execute(new Runnable() {
+            @Override
+            public void run() {
+                for (int i = 0; i < numListenersBefore; i++) {
+                    promise.addListener(listener);
+                }
+                promise.setSuccess(null);
+
+                GlobalEventExecutor.INSTANCE.execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        promise.addListener(listener);
+                    }
+                });
+                promise.addListener(listener);
+            }
+        });
+
+        assertTrue("Should have notifed " + expectedCount + " listeners", latch.await(5, TimeUnit.SECONDS));
+        executor.shutdownGracefully().sync();
+    }
+
+    private static final class TestEventExecutor extends SingleThreadEventExecutor {
+        TestEventExecutor() {
+            super(null, Executors.defaultThreadFactory(), true);
+        }
+
+        @Override
+        protected void run() {
+            for (;;) {
+                Runnable task = takeTask();
+                if (task != null) {
+                    task.run();
+                    updateLastExecutionTime();
+                }
+
+                if (confirmShutdown()) {
+                    break;
+                }
+            }
+        }
+    }
 }