diff --git a/main.go b/main.go
index 9e3ed7eedb230245ea10f953e0dc4b5ab1cfd452..6e9fc4f7b4acf9ee8ee2d103336485d8d114ff07 100644
--- a/main.go
+++ b/main.go
@@ -460,9 +460,12 @@ func main() {
 						if len(s[1]) > 0 {
 							payload, _ := base64.StdEncoding.DecodeString(s[1])
 							log.Debug(string(payload))
-							// payload = append(payload, []byte{125}...)
-							// log.Debug(string(payload))
+							// Check if the payload is well ended
+							if payload[len(payload)-1] != 125 {
+								payload = append(payload, []byte{125}...)
+							}
 							// Decode the payload from the token
+							if payload
 							var token GrdfConsentementToken
 							err := json.Unmarshal(payload, &token)
 							if err != nil {