diff --git a/models/silver/core/silver__blocks.sql b/models/silver/core/silver__blocks.sql
index b52d5c6..94605f5 100644
--- a/models/silver/core/silver__blocks.sql
+++ b/models/silver/core/silver__blocks.sql
@@ -43,6 +43,7 @@ WITH pre_final AS (
     WHERE
         block_id IS NOT NULL
         AND error IS NULL
+        AND data IS NOT NULL
         {% if is_incremental() %}
         AND _inserted_timestamp >= '{{ max_inserted_timestamp }}'
         {% endif %}
diff --git a/models/streamline/core/complete/streamline__blocks_complete.sql b/models/streamline/core/complete/streamline__blocks_complete.sql
index 3e12b4f..d3a3ca6 100644
--- a/models/streamline/core/complete/streamline__blocks_complete.sql
+++ b/models/streamline/core/complete/streamline__blocks_complete.sql
@@ -26,6 +26,7 @@ WHERE
         FROM
             {{ this }}
     )
+    AND data IS NOT NULL
 {% else %}
     {{ ref('bronze__FR_blocks') }}
 {% endif %}
diff --git a/models/streamline/core/streamline__chainhead.sql b/models/streamline/core/streamline__chainhead.sql
index f028de7..26f390b 100644
--- a/models/streamline/core/streamline__chainhead.sql
+++ b/models/streamline/core/streamline__chainhead.sql
@@ -24,4 +24,4 @@ SELECT
             []
         ),
         'Vault/prod/eclipse/mainnet'
-    ) :data :result :: INT AS block_id
+    ) :data :result :: INT - 50 AS block_id