diff --git a/packages/ipfs-cli/src/commands/add.js b/packages/ipfs-cli/src/commands/add.js
index f310979df0..79960c35b8 100644
--- a/packages/ipfs-cli/src/commands/add.js
+++ b/packages/ipfs-cli/src/commands/add.js
@@ -79,8 +79,7 @@ module.exports = {
     },
     'raw-leaves': {
       type: 'boolean',
-      describe: 'Use raw blocks for leaf nodes. (experimental)',
-      default: false
+      describe: 'Use raw blocks for leaf nodes. (experimental)'
     },
     'cid-version': {
       type: 'integer',
@@ -241,6 +240,10 @@ module.exports = {
       }
     }
 
+    if (options.rawLeaves == null) {
+      options.rawLeaves = cidVersion > 0
+    }
+
     const source = file
       ? globSource(file, {
         recursive,
diff --git a/packages/ipfs-cli/test/add.js b/packages/ipfs-cli/test/add.js
index 31f05bcc54..0cadcae844 100644
--- a/packages/ipfs-cli/test/add.js
+++ b/packages/ipfs-cli/test/add.js
@@ -101,7 +101,8 @@ describe('add', () => {
 
     ipfs.addAll.withArgs(matchIterable(), {
       ...defaultOptions,
-      cidVersion: 1
+      cidVersion: 1,
+      rawLeaves: true
     }).returns([{
       cid,
       path: 'README.md'