diff --git a/app/lib/entity/block.js b/app/lib/entity/block.js
index 9670c8ebbc37e2f6a9740bda7831c38a429f5296..a8d847c4da848d77b7ea745bd757aa4a5937b33d 100644
--- a/app/lib/entity/block.js
+++ b/app/lib/entity/block.js
@@ -45,7 +45,8 @@ function Block(json) {
       "time",
       "medianTime",
       "membersCount",
-      "monetaryMass"
+      "monetaryMass",
+      "unitbase"
     ].forEach(function(field){
         json[field] = parseInt(that[field], 10);
       });
@@ -66,8 +67,7 @@ function Block(json) {
         json[field] = that[field] || null;
       });
     [
-      "dividend",
-      "unitbase"
+      "dividend"
     ].forEach(function(field){
         json[field] = parseInt(that[field]) || null;
       });
diff --git a/app/service/BlockchainService.js b/app/service/BlockchainService.js
index 3efc0ecc39f3f325bb64eccb59a4a1b241e4f2fc..2b5253955ac8409349cc5431778e39a84129a0ee 100644
--- a/app/service/BlockchainService.js
+++ b/app/service/BlockchainService.js
@@ -452,17 +452,13 @@ function BlockchainService () {
     };
     // Insert a bunch of blocks
     let lastPrevious = blocks[0].number == 0 ? null : yield dal.getBlock(blocks[0].number - 1);
-    let rootBlock = (blocks[0].number == 0 ? blocks[0] : null) || (yield dal.getBlockOrNull(0));
-    let rootConf = getParameters(rootBlock);
-    let maxBlock = getMaxBlocksToStoreAsFile(rootConf);
-    let lastBlockToSave = blocks[blocks.length - 1];
     for (let i = 0; i < blocks.length; i++) {
       let previous = i > 0 ? blocks[i - 1] : lastPrevious;
       let block = blocks[i];
       block.fork = false;
-      //console.log('Block #%s', block.number);
       // Monetary mass & UD Time recording before inserting elements
       block.monetaryMass = (previous && previous.monetaryMass) || 0;
+      block.unitbase = block.unitbase || 0;
       block.dividend = block.dividend || 0;
       // UD Time update
       let previousBlock = i > 0 ? blocks[i - 1] : lastPrevious;
@@ -493,7 +489,7 @@ function BlockchainService () {
     yield mainContext.updateCertificationsForBlocks(blocks);
     // Create / Update sources
     yield mainContext.updateTransactionSourcesForBlocks(blocks);
-    yield dal.blockDAL.saveBunch(blocks, (targetLastNumber - lastBlockToSave.number) > maxBlock);
+    yield dal.blockDAL.saveBunch(blocks);
     yield pushStatsForBlocks(blocks);
   });