diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp
index 267f837a8aee7aa90f5c7c671f3e989a05db3d58..1d519dec5d23efde5b2bfaf7b1e74a058ce9237f 100644
--- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp
+++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp
@@ -806,17 +806,16 @@ void WifiSettings::SetKeyMgmtBitset(WifiDeviceConfig &config)
     if (index < 0) {
         return;
     }
-    config.keyMgmtBitset |= (1 << index);
+    unsigned int uindex =  static_cast<unsigned int>(index);
+
+    config.keyMgmtBitset |= (1 << uindex);
     if (config.keyMgmt == KEY_MGMT_WPA_PSK) {
         index = FindKeyMgmtPosition(KEY_MGMT_SAE);
-        config.keyMgmtBitset |= (1 << index);
+        config.keyMgmtBitset |= (1 << uindex);
     }
     if (config.keyMgmt == KEY_MGMT_SAE) {
         index = FindKeyMgmtPosition(KEY_MGMT_WPA_PSK);
-        if (index < 0) {
-            return;
-        }
-        config.keyMgmtBitset |= (1 << index);
+        config.keyMgmtBitset |= (1 << uindex);
     }
 }