diff --git a/src/apdu_sign.c b/src/apdu_sign.c
index 00af1963..f62720dc 100644
--- a/src/apdu_sign.c
+++ b/src/apdu_sign.c
@@ -186,13 +186,6 @@ static bool sign_reject(void) {
     return true;
 }
 
-/// Magic byte values
-/// See: https://tezos.gitlab.io/user/key-management.html#signer-requests
-#define MAGIC_BYTE_UNSAFE_OP      0x03u  /// magic byte of an operation
-#define MAGIC_BYTE_BLOCK          0x11u  /// magic byte of a block
-#define MAGIC_BYTE_PREATTESTATION 0x12u  /// magic byte of a pre-attestation
-#define MAGIC_BYTE_ATTESTATION    0x13u  /// magic byte of an attestation
-
 /**
  * @brief Carries out final checks before signing
  *
@@ -303,11 +296,17 @@ int handle_sign(buffer_t *cdata, const bool last, const bool with_hash) {
     TZ_ASSERT(G.packet_index == 1u, EXC_PARSE_ERROR);
 
     TZ_ASSERT(buffer_read_u8(cdata, &G.magic_byte), EXC_PARSE_ERROR);
+    bool is_attestation = false;
 
     switch (G.magic_byte) {
         case MAGIC_BYTE_PREATTESTATION:
+            is_attestation = false;
+            TZ_ASSERT(parse_consensus_operation(cdata, &G.parsed_baking_data, is_attestation),
+                      EXC_PARSE_ERROR);
         case MAGIC_BYTE_ATTESTATION:
-            TZ_ASSERT(parse_consensus_operation(cdata, &G.parsed_baking_data), EXC_PARSE_ERROR);
+            is_attestation = true;
+            TZ_ASSERT(parse_consensus_operation(cdata, &G.parsed_baking_data, is_attestation),
+                      EXC_PARSE_ERROR);
             break;
         case MAGIC_BYTE_BLOCK:
             TZ_ASSERT(parse_block(cdata, &G.parsed_baking_data), EXC_PARSE_ERROR);
diff --git a/src/baking_auth.c b/src/baking_auth.c
index a16b5964..48d95cde 100644
--- a/src/baking_auth.c
+++ b/src/baking_auth.c
@@ -216,10 +216,6 @@ bool parse_block(buffer_t *buf, parsed_baking_data_t *const out) {
     return true;
 }
 
-#define TAG_PREATTESTATION  20
-#define TAG_ATTESTATION     21
-#define TAG_ATTESTATION_DAL 23
-
 /**
  * Data:
  *   + (4 bytes)  uint32:  chain id of the block
@@ -230,12 +226,14 @@ bool parse_block(buffer_t *buf, parsed_baking_data_t *const out) {
  *   + (4 bytes)  uint32:  round of the related block
  *   + (32 bytes) uint8 *: hash of the related block
  */
-bool parse_consensus_operation(buffer_t *buf, parsed_baking_data_t *const out) {
+bool parse_consensus_operation(buffer_t *buf,
+                               parsed_baking_data_t *const out,
+                               bool is_attestation) {
     uint8_t tag;
 
     if (!buffer_read_u32(buf, &out->chain_id.v, BE) ||   // chain id
         !buffer_seek_cur(buf, 32u * sizeof(uint8_t)) ||  // ignore branch
-        !buffer_read_u8(buf, &tag) ||                    // tag
+        !buffer_read_u8(buf, &tag) ||                    // ignore tag
         !buffer_seek_cur(buf, sizeof(uint16_t)) ||       // ignore slot
         !buffer_read_u32(buf, &out->level, BE) ||        // level
         !buffer_read_u32(buf, &out->round, BE) ||        // round
@@ -243,20 +241,8 @@ bool parse_consensus_operation(buffer_t *buf, parsed_baking_data_t *const out) {
     ) {
         return false;
     }
-
-    switch (tag) {
-        case TAG_PREATTESTATION:
-            out->type = BAKING_TYPE_PREATTESTATION;
-            break;
-        case TAG_ATTESTATION:
-        case TAG_ATTESTATION_DAL:
-            out->type = BAKING_TYPE_ATTESTATION;
-            break;
-        default:
-            return false;
-    }
+    out->type = is_attestation ? BAKING_TYPE_ATTESTATION : BAKING_TYPE_PREATTESTATION;
 
     out->is_tenderbake = true;
-
     return true;
 }
diff --git a/src/baking_auth.h b/src/baking_auth.h
index ab74e137..e29576d0 100644
--- a/src/baking_auth.h
+++ b/src/baking_auth.h
@@ -79,6 +79,7 @@ bool parse_block(buffer_t *buf, parsed_baking_data_t *const out);
  *
  * @param buf: input buffer containing the consensus operation
  * @param out: baking data output
+ * @param is_attestation: whether its an attestation or pre-attestation.
  * @return bool: returns false if it is invalid
  */
-bool parse_consensus_operation(buffer_t *buf, parsed_baking_data_t *const out);
+bool parse_consensus_operation(buffer_t *buf, parsed_baking_data_t *const out, bool is_attestation);
diff --git a/src/globals.h b/src/globals.h
index 0ff19f72..b4bd4ee3 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -106,7 +106,7 @@ typedef struct {
     blake2b_hash_state_t hash_state;     ///< current blake2b hash state
     uint8_t final_hash[SIGN_HASH_SIZE];  ///< buffer to hold hash of all the message
 
-    uint8_t magic_byte;              ///< current magic byte read
+    magic_byte_t magic_byte;         ///< current magic byte read
     struct parse_state parse_state;  ///< current parser state
 } apdu_sign_state_t;
 
diff --git a/src/types.h b/src/types.h
index e10e1600..f0ea63eb 100644
--- a/src/types.h
+++ b/src/types.h
@@ -68,6 +68,17 @@ typedef enum {
     BAKING_TYPE_PREATTESTATION
 } baking_type_t;
 
+/**
+ * @brief magic byte of operations
+ * See: https://tezos.gitlab.io/user/key-management.html#signer-requests
+ */
+typedef enum {
+    MAGIC_BYTE_UNSAFE_OP = 0x03u,       /// magic byte of an operation
+    MAGIC_BYTE_BLOCK = 0x11u,           /// magic byte of a block
+    MAGIC_BYTE_PREATTESTATION = 0x12u,  /// magic byte of a pre-attestation
+    MAGIC_BYTE_ATTESTATION = 0x13u,     /// magic byte of an attestation
+} magic_byte_t;
+
 typedef uint32_t level_t;
 typedef uint32_t round_t;