diff --git a/library/ccm.c b/library/ccm.c
index 8025409690..a6eed4a56c 100644
--- a/library/ccm.c
+++ b/library/ccm.c
@@ -488,11 +488,11 @@ int mbedtls_ccm_finish(mbedtls_ccm_context *ctx,
         return MBEDTLS_ERR_CCM_BAD_INPUT;
     }
 
-    /* Reject invalid tag lengths and mismatches with negotiated length (if set). */
-    if (tag_len != 0 && (tag_len < 4 || tag_len > 16 || (tag_len & 1) != 0)) {
+    if (!(ctx->state & CCM_STATE__LENGTHS_SET)) {
         return MBEDTLS_ERR_CCM_BAD_INPUT;
     }
-    if ((ctx->state & CCM_STATE__LENGTHS_SET) && tag_len != ctx->tag_len) {
+
+    if (tag_len != ctx->tag_len) {
         return MBEDTLS_ERR_CCM_BAD_INPUT;
     }