diff --git a/src/main/java/org/asteriskjava/manager/internal/ManagerReaderImpl.java b/src/main/java/org/asteriskjava/manager/internal/ManagerReaderImpl.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/asteriskjava/manager/internal/ManagerReaderImpl.java
+++ b/src/main/java/org/asteriskjava/manager/internal/ManagerReaderImpl.java
@@ -343,11 +343,7 @@ public class ManagerReaderImpl implements ManagerReader
         final String internalActionId = ManagerUtil.getInternalActionId(actionId);
         if (internalActionId != null)
         {
-            responseClass = expectedResponseClasses.get(internalActionId);
-            if (responseClass != null)
-            {
-                expectedResponseClasses.remove(internalActionId);
-            }
+            responseClass = expectedResponseClasses.remove(internalActionId);
         }
 
         final ManagerResponse response = responseBuilder.buildResponse(responseClass, buffer);
Remove a check-then-act in ManagerReaderImpl