diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index 39f53c2ea..e32d3b387 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -103,6 +103,7 @@
                         <commit subject="Rename bundle-* options to repo-bundle-*.">
                             <github-pull-request id="1694"/>
                         </commit>
+                        <commit subject="Disable repo-hardlink option when repo-bundle option is enabled."/>
 
                         <release-item-contributor-list>
                             <release-item-contributor id="david.steele"/>
diff --git a/src/build/config/config.yaml b/src/build/config/config.yaml
index 155260c8d..ee54b9eb9 100644
--- a/src/build/config/config.yaml
+++ b/src/build/config/config.yaml
@@ -1840,6 +1840,10 @@ option:
       backup: {}
     command-role:
       main: {}
+    depend:
+      option: repo-bundle
+      list:
+        - false
     deprecate:
       hardlink: {}
 
diff --git a/src/command/backup/backup.c b/src/command/backup/backup.c
index 8f7268077..d2c279a9c 100644
--- a/src/command/backup/backup.c
+++ b/src/command/backup/backup.c
@@ -190,6 +190,10 @@ backupInit(const InfoBackup *infoBackup)
         cfgOptionSet(cfgOptBackupStandby, cfgSourceParam, BOOL_FALSE_VAR);
     }
 
+    // If hardlink is not set (because bundles are enabled) then set to false
+    if (!cfgOptionTest(cfgOptRepoHardlink))
+        cfgOptionSet(cfgOptRepoHardlink, cfgSourceDefault, BOOL_FALSE_VAR);
+
     // Get database info when online
     PgControl pgControl = {0};
 
diff --git a/src/config/parse.auto.c b/src/config/parse.auto.c
index 51b30a1db..97ff2ad8a 100644
--- a/src/config/parse.auto.c
+++ b/src/config/parse.auto.c
@@ -5466,6 +5466,12 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
         (
             PARSE_RULE_OPTIONAL_GROUP
             (
+                PARSE_RULE_OPTIONAL_DEPEND
+                (
+                    PARSE_RULE_VAL_OPT(cfgOptRepoBundle),
+                    PARSE_RULE_VAL_BOOL_FALSE,
+                ),
+
                 PARSE_RULE_OPTIONAL_DEFAULT
                 (
                     PARSE_RULE_VAL_BOOL_FALSE,