diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/mbed_crc_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/mbed_crc_api.c
index 8f300193fe..d31eb64782 100644
--- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/mbed_crc_api.c
+++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/mbed_crc_api.c
@@ -42,7 +42,7 @@ void hal_crc_compute_partial_start(const crc_mbed_config_t* config)
     return;
   }
 
-  width = ((config->polynomial & 0xFFFF0000U) != 0) ? kCrcBits32 : kCrcBits16;
+  width = (config->width == 32) ? kCrcBits32 : kCrcBits16;
   final_xor = config->final_xor;
 
   crc_config_t platform_config;