diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56ba399b8..11bf5463f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## v0.90dev: UNDER DEVELOPMENT
 __No Release Date Set__
 
-* 
+* Fixed an issue where specifying `--no-archive-check` would throw a configuration error. _Reported by Jason O'Donnell_.
 
 ## v0.89: Timeout Bug Fix and Restore Read-Only Repositories
 __Released December 24, 2015__
diff --git a/doc/xml/change-log.xml b/doc/xml/change-log.xml
index e01c4a245..6b808d5c0 100644
--- a/doc/xml/change-log.xml
+++ b/doc/xml/change-log.xml
@@ -9,7 +9,7 @@
         <changelog-release date="XXXX-XX-XX" version="0.90dev" title="UNDER DEVELOPMENT">
             <release-feature-bullet-list>
                 <release-feature>
-                    <text></text>
+                    <text>Fixed an issue where specifying <setting>--no-archive-check</setting> would throw a configuration error.  <i>Reported by Jason O'Donnell</i>.</text>
                 </release-feature>
             </release-feature-bullet-list>
         </changelog-release>
diff --git a/lib/BackRest/Backup.pm b/lib/BackRest/Backup.pm
index 86ad0814c..54419013b 100644
--- a/lib/BackRest/Backup.pm
+++ b/lib/BackRest/Backup.pm
@@ -732,7 +732,8 @@ sub process
     $oBackupManifest->boolSet(MANIFEST_SECTION_BACKUP_OPTION, MANIFEST_KEY_HARDLINK, undef, $bHardLink);
     $oBackupManifest->boolSet(MANIFEST_SECTION_BACKUP_OPTION, MANIFEST_KEY_START_STOP, undef, !optionGet(OPTION_NO_START_STOP));
     $oBackupManifest->boolSet(MANIFEST_SECTION_BACKUP_OPTION, MANIFEST_KEY_ARCHIVE_COPY, undef,
-                              optionGet(OPTION_NO_START_STOP) || optionGet(OPTION_BACKUP_ARCHIVE_COPY));
+                              optionGet(OPTION_NO_START_STOP) ||
+                              (optionGet(OPTION_BACKUP_ARCHIVE_CHECK) && optionGet(OPTION_BACKUP_ARCHIVE_COPY)));
     $oBackupManifest->boolSet(MANIFEST_SECTION_BACKUP_OPTION, MANIFEST_KEY_ARCHIVE_CHECK, undef,
                               optionGet(OPTION_NO_START_STOP) || optionGet(OPTION_BACKUP_ARCHIVE_CHECK));
 
diff --git a/test/lib/BackRestTest/BackupTest.pm b/test/lib/BackRestTest/BackupTest.pm
index 72443ae7b..8063505c9 100755
--- a/test/lib/BackRestTest/BackupTest.pm
+++ b/test/lib/BackRestTest/BackupTest.pm
@@ -1436,7 +1436,7 @@ sub BackRestTestBackup_Test
             $strComment = 'update during backup';
             BackRestTestBackup_BackupBegin($strType, $strStanza, $strComment,
                                            {strTest => TEST_MANIFEST_BUILD, fTestDelay => $fTestDelay,
-                                            strOptionalParam => '--' . OPTION_STOP_AUTO});
+                                            strOptionalParam => '--' . OPTION_STOP_AUTO . ' --no-' . OPTION_BACKUP_ARCHIVE_CHECK});
 
             BackRestTestBackup_PgExecute("drop table test_remove", false);
             BackRestTestBackup_PgSwitchXlog();