diff --git a/bulkredditdownloader/__main__.py b/bulkredditdownloader/__main__.py
index 4c1158e..fb0081a 100644
--- a/bulkredditdownloader/__main__.py
+++ b/bulkredditdownloader/__main__.py
@@ -48,6 +48,7 @@ def cli():
 @click.option('--file-scheme', default=None, type=str)
 @click.option('--folder-scheme', default=None, type=str)
 @click.option('--make-hard-links', is_flag=True, default=None)
+@click.option('--max-wait-time', type=int, default=None)
 @click.option('--no-dupes', is_flag=True, default=None)
 @click.option('--search-existing', is_flag=True, default=None)
 @click.option('--skip', default=None, multiple=True)
diff --git a/bulkredditdownloader/configuration.py b/bulkredditdownloader/configuration.py
index aa634b6..e6d0af7 100644
--- a/bulkredditdownloader/configuration.py
+++ b/bulkredditdownloader/configuration.py
@@ -17,6 +17,7 @@ class Configuration(Namespace):
         self.exclude_id_file = []
         self.limit: Optional[int] = None
         self.link: list[str] = []
+        self.max_wait_time = None
         self.multireddit: list[str] = []
         self.no_dupes: bool = False
         self.saved: bool = False
diff --git a/bulkredditdownloader/downloader.py b/bulkredditdownloader/downloader.py
index 3ad1918..434eb74 100644
--- a/bulkredditdownloader/downloader.py
+++ b/bulkredditdownloader/downloader.py
@@ -70,6 +70,8 @@ class RedditDownloader:
         self._load_config()
         self._create_file_logger()
 
+        self._read_config()
+
         self.download_filter = self._create_download_filter()
         logger.log(9, 'Created download filter')
         self.time_filter = self._create_time_filter()
@@ -91,6 +93,18 @@ class RedditDownloader:
         self.authenticator = self._create_authenticator()
         logger.log(9, 'Created site authenticator')
 
+    def _read_config(self):
+        """Read any cfg values that need to be processed"""
+        if self.args.max_wait_time is None:
+            if not self.cfg_parser.has_option('DEFAULT', 'max_wait_time'):
+                self.cfg_parser.set('DEFAULT', 'max_wait_time', '120')
+                logger.log(9, 'Wrote default download wait time download to config file')
+            self.args.max_wait_time = self.cfg_parser.getint('DEFAULT', 'max_wait_time')
+            logger.debug(f'Setting maximum download wait time to {self.args.max_wait_time} seconds')
+        # Update config on disk
+        with open(self.config_location, 'w') as file:
+            self.cfg_parser.write(file)
+
     def _create_reddit_instance(self):
         if self.args.authenticate:
             logger.debug('Using authenticated Reddit instance')
@@ -371,7 +385,7 @@ class RedditDownloader:
                 logger.debug(f'File {destination} already exists, continuing')
             else:
                 try:
-                    res.download(self.cfg_parser.getint('DEFAULT', 'max_wait_time', fallback=120))
+                    res.download(self.args.max_wait_time)
                 except errors.BulkDownloaderException as e:
                     logger.error(
                         f'Failed to download resource {res.url} with downloader {downloader_class.__name__}: {e}')