diff --git a/p2p/database/database.go b/p2p/database/database.go
index 9f44be00..307ff53c 100644
--- a/p2p/database/database.go
+++ b/p2p/database/database.go
@@ -2,6 +2,7 @@ package database
 
 import (
 	"context"
+	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -13,7 +14,7 @@ import (
 // to. To use another database solution, just implement these methods and
 // update the sensor to use the new connection.
 type Database interface {
-	WriteBlock(context.Context, *enode.Node, *types.Block)
+	WriteBlock(context.Context, *enode.Node, *types.Block, *big.Int)
 	WriteBlockHeaders(context.Context, []*types.Header)
 	WriteBlockHashes(context.Context, *enode.Node, []common.Hash)
 	WriteBlockBody(context.Context, *eth.BlockBody, common.Hash)
diff --git a/p2p/database/datastore.go b/p2p/database/datastore.go
index 2c16b718..51d7141c 100644
--- a/p2p/database/datastore.go
+++ b/p2p/database/datastore.go
@@ -3,6 +3,7 @@ package database
 import (
 	"context"
 	"fmt"
+	"math/big"
 	"time"
 
 	"cloud.google.com/go/datastore"
@@ -66,8 +67,9 @@ type DatastoreHeader struct {
 // DatastoreBlock represents a block stored in datastore.
 type DatastoreBlock struct {
 	*DatastoreHeader
-	Transactions []*datastore.Key
-	Uncles       []*datastore.Key
+	TotalDifficulty string
+	Transactions    []*datastore.Key
+	Uncles          []*datastore.Key
 }
 
 // DatastoreTransaction represents a transaction stored in datastore. Data is
@@ -107,7 +109,7 @@ func NewDatastore(ctx context.Context, projectID string, sensorID string, maxCon
 }
 
 // WriteBlock writes the block and the block event to datastore.
-func (d *datastoreWrapper) WriteBlock(ctx context.Context, peer *enode.Node, block *types.Block) {
+func (d *datastoreWrapper) WriteBlock(ctx context.Context, peer *enode.Node, block *types.Block, td *big.Int) {
 	d.writeEvent(peer, blockEventsKind, block.Hash(), blocksKind)
 
 	key := datastore.NameKey(blocksKind, block.Hash().Hex(), nil)
@@ -116,11 +118,20 @@ func (d *datastoreWrapper) WriteBlock(ctx context.Context, peer *enode.Node, blo
 	// are nil we will just set them.
 	_ = d.client.Get(ctx, key, &dsBlock)
 
+	shouldWrite := false
+
 	if dsBlock.DatastoreHeader == nil {
+		shouldWrite = true
 		dsBlock.DatastoreHeader = newDatastoreHeader(block.Header())
 	}
 
+	if len(dsBlock.TotalDifficulty) == 0 {
+		shouldWrite = true
+		dsBlock.TotalDifficulty = td.String()
+	}
+
 	if dsBlock.Transactions == nil && len(block.Transactions()) > 0 {
+		shouldWrite = true
 		if d.shouldWriteTransactions {
 			d.writeTransactions(ctx, block.Transactions())
 		}
@@ -132,6 +143,7 @@ func (d *datastoreWrapper) WriteBlock(ctx context.Context, peer *enode.Node, blo
 	}
 
 	if dsBlock.Uncles == nil && len(block.Uncles()) > 0 {
+		shouldWrite = true
 		dsBlock.Uncles = make([]*datastore.Key, 0, len(block.Uncles()))
 		for _, uncle := range block.Uncles() {
 			d.writeBlockHeader(ctx, uncle)
@@ -139,6 +151,10 @@ func (d *datastoreWrapper) WriteBlock(ctx context.Context, peer *enode.Node, blo
 		}
 	}
 
+	if !shouldWrite {
+		return
+	}
+
 	if _, err := d.client.Put(ctx, key, &dsBlock); err != nil {
 		log.Error().Err(err).Msg("Failed to write new block")
 	}
diff --git a/p2p/rlpx.go b/p2p/rlpx.go
index 1cdaf30c..139b4d5e 100644
--- a/p2p/rlpx.go
+++ b/p2p/rlpx.go
@@ -277,7 +277,7 @@ func (c *Conn) ReadAndServe(db database.Database, count *MessageCount) error {
 
 					dbCh <- struct{}{}
 					go func() {
-						db.WriteBlock(ctx, c.node, msg.Block)
+						db.WriteBlock(ctx, c.node, msg.Block, msg.TD)
 						<-dbCh
 					}()
 				}