diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae6ade421..7eaec81c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,7 @@ at anytime.
   * Removed unused files
   * Removed old and unused UI related code
   * Removed claim information from lbry file internals
+  * Removed `auto_re_reflect` setting from the conf file, use the `reflect_uploads` setting instead
 
 
 ## [0.18.0] - 2017-11-08
diff --git a/lbrynet/conf.py b/lbrynet/conf.py
index 1c26b023d..85d86d8d1 100644
--- a/lbrynet/conf.py
+++ b/lbrynet/conf.py
@@ -277,11 +277,9 @@ ADJUSTABLE_SETTINGS = {
     'peer_port': (int, 3333),
     'pointtrader_server': (str, 'http://127.0.0.1:2424'),
     'reflector_port': (int, 5566),
-    # if reflect_uploads is True, reflect files on publish
+    # if reflect_uploads is True, send files to reflector (after publishing as well as a
+    # periodic check in the event the initial upload failed or was disconnected part way through
     'reflect_uploads': (bool, True),
-    # if auto_re_reflect is True, attempt to re-reflect files on startup and
-    # at every auto_re_reflect_interval seconds, useful if initial reflect is unreliable
-    'auto_re_reflect': (bool, True),
     'auto_re_reflect_interval': (int, 3600),
     'reflector_servers': (list, [('reflector2.lbry.io', 5566)], server_list),
     'run_reflector_server': (bool, False),
diff --git a/lbrynet/file_manager/EncryptedFileManager.py b/lbrynet/file_manager/EncryptedFileManager.py
index 9d022c1d7..a1ffc0da3 100644
--- a/lbrynet/file_manager/EncryptedFileManager.py
+++ b/lbrynet/file_manager/EncryptedFileManager.py
@@ -32,7 +32,7 @@ class EncryptedFileManager(object):
 
     def __init__(self, session, stream_info_manager, sd_identifier, download_directory=None):
 
-        self.auto_re_reflect = conf.settings['auto_re_reflect']
+        self.auto_re_reflect = conf.settings['reflect_uploads']
         self.auto_re_reflect_interval = conf.settings['auto_re_reflect_interval']
         self.session = session
         self.stream_info_manager = stream_info_manager