diff --git a/.changelog/836.bugfix.md b/.changelog/836.bugfix.md
new file mode 100644
index 000000000..22c5023df
--- /dev/null
+++ b/.changelog/836.bugfix.md
@@ -0,0 +1 @@
+storage: Update block proposer index to include height
diff --git a/storage/migrations/00_consensus.up.sql b/storage/migrations/00_consensus.up.sql
index 3b5364915..49d2c6334 100644
--- a/storage/migrations/00_consensus.up.sql
+++ b/storage/migrations/00_consensus.up.sql
@@ -43,13 +43,14 @@ CREATE TABLE chain.blocks
   namespace TEXT NOT NULL,
   version   UINT63 NOT NULL,
   state_root HEX64 NOT NULL,
-  
+
   proposer_entity_id base64_ed25519_pubkey,
   signer_entity_ids base64_ed25519_pubkey[]
 );
 CREATE INDEX ix_blocks_time ON chain.blocks (time);
 CREATE INDEX ix_blocks_block_hash ON chain.blocks (block_hash); -- Needed to lookup blocks by hash.
-CREATE INDEX ix_blocks_proposer_entity_id ON chain.blocks (proposer_entity_id);
+CREATE INDEX ix_blocks_proposer_entity_id ON chain.blocks (proposer_entity_id); -- Removed in 11_blocks_proposer_enitity_height_idx.up.sql
+-- CREATE INDEX ix_blocks_proposer_entity_id_height ON chain.blocks (proposer_entity_id, height); -- Added in 11_blocks_proposer_enitity_height_idx.up.sql
 CREATE INDEX ix_blocks_signer_entity_ids ON chain.blocks USING gin(signer_entity_ids);
 
 CREATE TABLE chain.transactions
diff --git a/storage/migrations/11_blocks_proposer_enitity_height_idx.up.sql b/storage/migrations/11_blocks_proposer_enitity_height_idx.up.sql
new file mode 100644
index 000000000..96918b1a8
--- /dev/null
+++ b/storage/migrations/11_blocks_proposer_enitity_height_idx.up.sql
@@ -0,0 +1,7 @@
+BEGIN;
+
+CREATE INDEX IF NOT EXISTS ix_blocks_proposer_entity_id_height ON chain.blocks (proposer_entity_id, height);
+
+DROP INDEX IF EXISTS chain.ix_blocks_proposer_entity_id;
+
+COMMIT;