diff --git a/client/src/cmdhfseos.c b/client/src/cmdhfseos.c
index 259f22f415..e9eeb94127 100644
--- a/client/src/cmdhfseos.c
+++ b/client/src/cmdhfseos.c
@@ -163,7 +163,11 @@ static int decrypt_cryptogram(uint8_t *key, uint8_t *input, uint8_t *out, int in
 }
 
 static void increment_command_wrapper(uint8_t *input, int input_len) {
-    input[input_len - 1]++; // Increment the last element of the header by 1
+    // Increment the end of the header by 1
+    uint8_t* offset = &input[input_len - sizeof(uint32_t)];
+    uint32_t value = MemBeToUint4byte(offset);
+    value++;
+    Uint4byteToMemBe(offset, value);
 }
 
 static void padToBlockSize(const uint8_t *input, int *inputSize, int blockSize, uint8_t *output) {