diff --git a/eoptasks.py b/eoptasks.py
index e057c26..d7bbb52 100755
--- a/eoptasks.py
+++ b/eoptasks.py
@@ -125,8 +125,9 @@ def filter_servers(servers, args):
     selected_servers = []
     if args.keywords:
         config = get_config()
-        conf_keywords = config.get('keywords') if 'keywords' in config else {}
-        cmd_keywords = conf_keywords.get(args.keywords, args.keywords)
+        cmd_keywords = args.keywords
+        if config.has_section('keywords'):
+            cmd_keywords = config['keywords'].get(args.keywords, args.keywords)
 
         for keyword in cmd_keywords.split(','):
             keywords = set(keyword.split('/'))