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 2d7b15b1a7..db54bb1594 100644
--- a/common/src/main/java/io/netty/util/concurrent/DefaultPromise.java
+++ b/common/src/main/java/io/netty/util/concurrent/DefaultPromise.java
@@ -43,12 +43,7 @@ public class DefaultPromise<V> extends AbstractFuture<V> implements Promise<V> {
     private volatile Object result;
     private Object listeners; // Can be ChannelFutureListener or DefaultFutureListeners
 
-    /**
-     * The the most significant 24 bits of this field represents the number of waiter threads waiting for this promise
-     * with await*() and sync*().  Subclasses can use the other 40 bits of this field to represents its own state, and
-     * are responsible for retaining the most significant 24 bits as is when modifying this field.
-     */
-    protected long state;
+    private long waiters;
 
     /**
      * Creates a new instance.
@@ -446,19 +441,18 @@ public class DefaultPromise<V> extends AbstractFuture<V> implements Promise<V> {
     }
 
     private boolean hasWaiters() {
-        return (state & 0xFFFFFF0000000000L) != 0;
+        return waiters > 0;
     }
 
     private void incWaiters() {
-        long newState = state + 0x10000000000L;
-        if ((newState & 0xFFFFFF0000000000L) == 0) {
+        if (waiters == Long.MAX_VALUE) {
             throw new IllegalStateException("too many waiters");
         }
-        state = newState;
+        waiters++;
     }
 
     private void decWaiters() {
-        state -= 0x10000000000L;
+        waiters--;
     }
 
     private void notifyListeners() {
diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelProgressivePromise.java b/transport/src/main/java/io/netty/channel/DefaultChannelProgressivePromise.java
index a0276fc23b..00dcb4b5f2 100644
--- a/transport/src/main/java/io/netty/channel/DefaultChannelProgressivePromise.java
+++ b/transport/src/main/java/io/netty/channel/DefaultChannelProgressivePromise.java
@@ -30,6 +30,7 @@ public class DefaultChannelProgressivePromise
         extends DefaultProgressivePromise<Void> implements ChannelProgressivePromise, FlushCheckpoint {
 
     private final Channel channel;
+    private long checkpoint;
 
     /**
      * Creates a new instance.
@@ -145,15 +146,12 @@ public class DefaultChannelProgressivePromise
 
     @Override
     public long flushCheckpoint() {
-        return state & 0x000000FFFFFFFFFFL;
+        return checkpoint;
     }
 
     @Override
     public void flushCheckpoint(long checkpoint) {
-        if ((checkpoint & 0xFFFFFF0000000000L) != 0) {
-            throw new IllegalStateException("flushCheckpoint overflow");
-        }
-        state = state & 0xFFFFFF0000000000L | checkpoint;
+        this.checkpoint = checkpoint;
     }
 
     @Override
diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelPromise.java b/transport/src/main/java/io/netty/channel/DefaultChannelPromise.java
index 21f49b6459..d6f4d2f196 100644
--- a/transport/src/main/java/io/netty/channel/DefaultChannelPromise.java
+++ b/transport/src/main/java/io/netty/channel/DefaultChannelPromise.java
@@ -28,6 +28,7 @@ import io.netty.util.concurrent.GenericFutureListener;
 public class DefaultChannelPromise extends DefaultPromise<Void> implements ChannelPromise, FlushCheckpoint {
 
     private final Channel channel;
+    private long checkpoint;
 
     /**
      * Creates a new instance.
@@ -137,15 +138,12 @@ public class DefaultChannelPromise extends DefaultPromise<Void> implements Chann
 
     @Override
     public long flushCheckpoint() {
-        return state & 0x000000FFFFFFFFFFL;
+        return checkpoint;
     }
 
     @Override
     public void flushCheckpoint(long checkpoint) {
-        if ((checkpoint & 0xFFFFFF0000000000L) != 0) {
-            throw new IllegalStateException("flushCheckpoint overflow");
-        }
-        state = state & 0xFFFFFF0000000000L | checkpoint;
+        this.checkpoint = checkpoint;
     }
 
     @Override