diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 275ce3c..33ec7b2 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -1765,12 +1765,9 @@
 		return -1;
 	}
 
-	priv->media_connected = false;
 	if (netif_carrier_ok(priv->netdev))
 		netif_carrier_off(priv->netdev);
 	mwifiex_stop_net_dev_queue(priv->netdev, priv->adapter);
-	mwifiex_clean_txrx(priv);
-	mwifiex_del_all_sta_list(priv);
 
 	return 0;
 }
@@ -1870,7 +1867,6 @@
 	if (mwifiex_set_mgmt_ies(priv, &params->beacon))
 		return -1;
 
-	priv->media_connected = true;
 	if (!netif_carrier_ok(priv->netdev))
 		netif_carrier_on(priv->netdev);
 	mwifiex_wake_up_net_dev_queue(priv->netdev, priv->adapter);
diff --git a/drivers/net/wireless/mwifiex/uap_event.c b/drivers/net/wireless/mwifiex/uap_event.c
index c5bb6ee..13504e2 100644
--- a/drivers/net/wireless/mwifiex/uap_event.c
+++ b/drivers/net/wireless/mwifiex/uap_event.c
@@ -113,8 +113,12 @@
 		mwifiex_del_sta_entry(priv, deauth_mac);
 		break;
 	case EVENT_UAP_BSS_IDLE:
+		priv->media_connected = false;
+		mwifiex_clean_txrx(priv);
+		mwifiex_del_all_sta_list(priv);
 		break;
 	case EVENT_UAP_BSS_ACTIVE:
+		priv->media_connected = true;
 		break;
 	case EVENT_UAP_BSS_START:
 		dev_dbg(adapter->dev, "AP EVENT: event id: %#x\n", eventcause);