diff --git a/wolfcrypt/src/cmac.c b/wolfcrypt/src/cmac.c
index 4d6552848..59585a9d1 100644
--- a/wolfcrypt/src/cmac.c
+++ b/wolfcrypt/src/cmac.c
@@ -114,9 +114,9 @@ int wc_InitCmac_ex(Cmac* cmac, const byte* key, word32 keySz,
 #endif
     XMEMSET(cmac, 0, sizeof(Cmac));
 
-    /* set invalid devId regardless of cryptoCb */
-    cmac->devId = devId;
 #ifdef WOLF_CRYPTO_CB
+    /* set invalid devId regardless of value */
+    cmac->devId = devId;
     #ifndef WOLF_CRYPTO_CB_FIND
     if (devId != INVALID_DEVID)
     #endif