diff --git a/lbrynet/conf.py b/lbrynet/conf.py
index 048efa836..53703139f 100644
--- a/lbrynet/conf.py
+++ b/lbrynet/conf.py
@@ -287,8 +287,11 @@ class Config:
             self.default_data_dir, self.default_wallet_dir, self.default_download_dir = get_linux_directories()
         else:
             assert None not in [data_dir, wallet_dir, download_dir]
+        if data_dir:
             self.default_data_dir = data_dir
+        if wallet_dir:
             self.default_wallet_dir = wallet_dir
+        if download_dir:
             self.default_download_dir = download_dir
 
         self._data = {
diff --git a/lbrynet/extras/cli.py b/lbrynet/extras/cli.py
index 7d83865ba..be9da80b7 100644
--- a/lbrynet/extras/cli.py
+++ b/lbrynet/extras/cli.py
@@ -207,7 +207,7 @@ def main(argv=None):
         return 1
 
     dir_args = {}
-    if len(argv) > 2:
+    if len(argv) >= 2:
         dir_arg_keys = [
             'data_dir',
             'wallet_dir',