diff --git a/src/mcore_bridge/model/modules/mtp_layer.py b/src/mcore_bridge/model/modules/mtp_layer.py
index 7f280a8..56d3b30 100644
--- a/src/mcore_bridge/model/modules/mtp_layer.py
+++ b/src/mcore_bridge/model/modules/mtp_layer.py
@@ -6,6 +6,7 @@
 from megatron.core import InferenceParams, parallel_state, tensor_parallel
 from megatron.core.enums import Fp8Recipe
 from megatron.core.extensions.transformer_engine import te_checkpoint
+from megatron.core.fp4_utils import get_fp4_context
 from megatron.core.fp8_utils import get_fp8_context
 from megatron.core.packed_seq_params import PackedSeqParams
 from megatron.core.tensor_parallel.mappings import (gather_from_sequence_parallel_region,
@@ -343,16 +344,18 @@ def _proj_and_transformer_layer(
         else:
             rng_context = nullcontext()
 
-        # Unlike transformer_block.py which needs to support mixed-precision in
-        # different layers,currently MTP only use global fp8 context.
+        # Same quant context as TransformerBlock. Leaving FP4 as a null context
+        # trains the MTP loss in the default dtype while the decoder is FP4.
         if self.config.fp8:
             fp8_context = get_fp8_context(self.config)
             transformer_layer_fp8_context = get_fp8_context(self.config)
+        elif self.config.fp4:
+            fp8_context = get_fp4_context(self.config)
+            transformer_layer_fp8_context = get_fp4_context(self.config)
         else:
             fp8_context = nullcontext()
             transformer_layer_fp8_context = nullcontext()
 
-        # TODO: currently ignoring FP4 in MTP layers because we need more numerical validation
         with rng_context:
             with fp8_context:
                 hidden_states = self._concat_embeddings(hidden_states, decoder_input)