diff --git a/api/src/main/java/be/naaturel/boardmateapi/controllers/ChatController.java b/api/src/main/java/be/naaturel/boardmateapi/controllers/ChatController.java
index b9503da6..9df6041b 100644
--- a/api/src/main/java/be/naaturel/boardmateapi/controllers/ChatController.java
+++ b/api/src/main/java/be/naaturel/boardmateapi/controllers/ChatController.java
@@ -53,7 +53,7 @@ public class ChatController {
             String messageId = this.webexService.post(model);
             model.setId(messageId);
             this.messageService.save(model);
-            expectedMessages.put(messageId, 0);
+            expectedMessages.put(messageId, 1);
 
             result.setSuccess(true);
             result.setData(messageId);
@@ -110,13 +110,16 @@ public class ChatController {
             ObjectMapper mapper = new ObjectMapper();
             WebexWebhook payload = mapper.readValue(rawPayload, WebexWebhook.class);
 
-            int seen = expectedMessages.get(payload.getData().getId());
-            if (seen == 2) {
-                Logger.displayInfo("Rejected");
-                expectedMessages.remove(payload.getData().getId());
-                return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(result);
+            Integer seen = expectedMessages.get(payload.getData().getId());
+            if(seen != null){
+                if(seen > 1){
+                    Logger.displayInfo("Rejected");
+                    expectedMessages.remove(payload.getData().getId());
+                } else {
+                    seen += 1;
+                    expectedMessages.put(payload.getData().getId(), seen);
+                }
             }
-            Logger.displayInfo("Accepted");
 
             Room room = webexService.getRoomById(payload.getData().getRoomId());
             Message msg = webexService.fetchMessage(payload.getData().getId());