diff --git a/src/main/java/io/appium/java_client/AppiumDriver.java b/src/main/java/io/appium/java_client/AppiumDriver.java
index a8757843c..8d0bf3cb1 100644
--- a/src/main/java/io/appium/java_client/AppiumDriver.java
+++ b/src/main/java/io/appium/java_client/AppiumDriver.java
@@ -31,6 +31,7 @@
 import org.openqa.selenium.UnsupportedCommandException;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.remote.CapabilityType;
+import org.openqa.selenium.remote.CommandInfo;
 import org.openqa.selenium.remote.DriverCommand;
 import org.openqa.selenium.remote.ErrorHandler;
 import org.openqa.selenium.remote.ExecuteMethod;
@@ -242,22 +243,23 @@ public Map<String, Object> getStatus() {
      * @param methodName The name of custom appium command.
      */
     public void addCommand(HttpMethod httpMethod, String url, String methodName) {
+        CommandInfo commandInfo;
         switch (httpMethod) {
             case GET:
-                MobileCommand.commandRepository.put(methodName, MobileCommand.getC(url));
+                commandInfo = MobileCommand.getC(url);
                 break;
             case POST:
-                MobileCommand.commandRepository.put(methodName, MobileCommand.postC(url));
+                commandInfo = MobileCommand.postC(url);
                 break;
             case DELETE:
-                MobileCommand.commandRepository.put(methodName, MobileCommand.deleteC(url));
+                commandInfo = MobileCommand.deleteC(url);
                 break;
             default:
                 throw new WebDriverException(String.format("Unsupported HTTP Method: %s. Only %s methods are supported",
                         httpMethod,
                         Arrays.toString(HttpMethod.values())));
         }
-        ((AppiumCommandExecutor) getCommandExecutor()).refreshAdditionalCommands();
+        ((AppiumCommandExecutor) getCommandExecutor()).defineCommand(methodName, commandInfo);
     }
 
     @Override
diff --git a/src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java b/src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java
index 78d7f5e12..377dce875 100644
--- a/src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java
+++ b/src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java
@@ -195,6 +195,10 @@ public void refreshAdditionalCommands() {
         getAdditionalCommands().forEach(this::defineCommand);
     }
 
+    public void defineCommand(String commandName, CommandInfo info) {
+        super.defineCommand(commandName, info);
+    }
+
     @SuppressWarnings("unchecked")
     private void setDirectConnect(Response response) throws SessionNotCreatedException {
         Map<String, ?> responseValue = (Map<String, ?>) response.getValue();