diff --git a/library/ccm.c b/library/ccm.c
index 9f97ca9fc2..11d1051e98 100644
--- a/library/ccm.c
+++ b/library/ccm.c
@@ -484,6 +484,10 @@ int mbedtls_ccm_finish(mbedtls_ccm_context *ctx,
         return MBEDTLS_ERR_CCM_BAD_INPUT;
     }
 
+    if (!(ctx->state & CCM_STATE__LENGTHS_SET)) {
+        return MBEDTLS_ERR_CCM_BAD_INPUT;
+    }
+
     if (ctx->add_len > 0 && !(ctx->state & CCM_STATE__AUTH_DATA_FINISHED)) {
         return MBEDTLS_ERR_CCM_BAD_INPUT;
     }
@@ -492,10 +496,6 @@ int mbedtls_ccm_finish(mbedtls_ccm_context *ctx,
         return MBEDTLS_ERR_CCM_BAD_INPUT;
     }
 
-    if (!(ctx->state & CCM_STATE__LENGTHS_SET)) {
-        return MBEDTLS_ERR_CCM_BAD_INPUT;
-    }
-
     if (tag_len != ctx->tag_len) {
         return MBEDTLS_ERR_CCM_BAD_INPUT;
     }