diff --git a/beacon_node/beacon_chain/src/block_production/gloas.rs b/beacon_node/beacon_chain/src/block_production/gloas.rs
index 9b6285bbac..6312885af2 100644
--- a/beacon_node/beacon_chain/src/block_production/gloas.rs
+++ b/beacon_node/beacon_chain/src/block_production/gloas.rs
@@ -692,11 +692,8 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                         ));
                     }
                 }
-                // TODO(gloas) we should never receive a blinded response.
-                // Should return some type of `Unexpected` error variant as this should never happen
-                // in the V4 block production flow
                 BlockProposalContentsType::Blinded(_) => {
-                    return Err(BlockProductionError::GloasNotImplemented);
+                    return Err(BlockProductionError::Unexpected("Should never produce a blinded block post-Gloas".to_owned()));
                 }
             };
 
diff --git a/beacon_node/beacon_chain/src/errors.rs b/beacon_node/beacon_chain/src/errors.rs
index bd6c13e364..36bc4d7a75 100644
--- a/beacon_node/beacon_chain/src/errors.rs
+++ b/beacon_node/beacon_chain/src/errors.rs
@@ -321,6 +321,7 @@ pub enum BlockProductionError {
     SszTypesError(ssz_types::Error),
     // TODO(gloas): Remove this once Gloas is implemented
     GloasNotImplemented,
+    Unexpected(String),
 }
 
 easy_from_to!(BlockProcessingError, BlockProductionError);