diff --git a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfSessionMinaImpl.java b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfSessionMinaImpl.java
index e73a4c6..03b20e3 100644
--- a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfSessionMinaImpl.java
+++ b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfSessionMinaImpl.java
@@ -841,8 +841,8 @@
                         event.getDeviceInfo(), event.getMessagePayload());
                 return;
             }
-            CompletableFuture<String> completedReply =
-                    replies.get(messageId.get()); // remove(..)?
+            // Remove the message as it has been processed.
+            CompletableFuture<String> completedReply = replies.remove(messageId.get());
             if (completedReply != null) {
                 completedReply.complete(event.getMessagePayload());
             }