diff --git a/electrum b/electrum
index aedd7ae1d..384f5d7e3 100755
--- a/electrum
+++ b/electrum
@@ -74,7 +74,7 @@ from electrum import SimpleConfig, Network, Wallet, WalletStorage, NetworkProxy
 from electrum.util import print_msg, print_error, print_stderr, print_json, set_verbosity, InvalidPassword
 from electrum.daemon import get_daemon
 from electrum.plugins import init_plugins
-from electrum.commands import get_parser, known_commands, Commands
+from electrum.commands import get_parser, known_commands, Commands, config_variables
 
 
 # get password routine
@@ -378,7 +378,7 @@ if __name__ == '__main__':
     else:
         config_options = args.__dict__
         for k, v in config_options.items():
-            if v is None:
+            if v is None or (k in config_variables.get(args.cmd, {}).keys()):
                 config_options.pop(k)
         if config_options.get('server'):
             config_options['auto_connect'] = False