diff --git a/ouroboros-consensus/test-storage/Test/Ouroboros/Storage/ChainDB/ImmDB.hs b/ouroboros-consensus/test-storage/Test/Ouroboros/Storage/ChainDB/ImmDB.hs
index 93085164fdb..f83ca093713 100644
--- a/ouroboros-consensus/test-storage/Test/Ouroboros/Storage/ChainDB/ImmDB.hs
+++ b/ouroboros-consensus/test-storage/Test/Ouroboros/Storage/ChainDB/ImmDB.hs
@@ -20,7 +20,7 @@ import qualified Cardano.Chain.Update as Update
 import           Ouroboros.Network.Block (BlockNo (..), ChainHash (..),
                      SlotNo (..), blockPoint)
 
-import           Ouroboros.Consensus.Block (BlockProtocol)
+import           Ouroboros.Consensus.Block (BlockProtocol, getHeader)
 import           Ouroboros.Consensus.Ledger.Byron (ByronBlock)
 import           Ouroboros.Consensus.Ledger.Byron.Forge (forgeEBB)
 import           Ouroboros.Consensus.Node.ProtocolInfo
@@ -76,7 +76,7 @@ withImmDB k = do
       , immEpochInfo   = epochInfo
       , immHashInfo    = nodeHashInfo (Proxy @ByronBlock)
       , immValidation  = ValidateMostRecentEpoch
-      , immIsEBB       = nodeIsEBB
+      , immIsEBB       = nodeIsEBB . getHeader
       , immTracer      = nullTracer
       }
 
diff --git a/ouroboros-consensus/tools/db-analyse/Main.hs b/ouroboros-consensus/tools/db-analyse/Main.hs
index 003c4be38a6..661f30325d1 100644
--- a/ouroboros-consensus/tools/db-analyse/Main.hs
+++ b/ouroboros-consensus/tools/db-analyse/Main.hs
@@ -22,6 +22,7 @@ import qualified Cardano.Crypto as Crypto
 import           Ouroboros.Network.Block (HasHeader (..), SlotNo (..),
                      genesisPoint)
 
+import           Ouroboros.Consensus.Block (getHeader)
 import           Ouroboros.Consensus.Ledger.Byron (ByronBlock, ByronHash)
 import qualified Ouroboros.Consensus.Ledger.Byron as Byron
 import           Ouroboros.Consensus.Node.Run.Abstract