diff --git a/umac/scan/core/src/wlan_scan_cache_db.c b/umac/scan/core/src/wlan_scan_cache_db.c
index 8940993..31a1b00 100644
--- a/umac/scan/core/src/wlan_scan_cache_db.c
+++ b/umac/scan/core/src/wlan_scan_cache_db.c
@@ -425,12 +425,12 @@
 		/* If elapsed time since last rssi update for this
 		 * entry is smaller than a thresold, calculate a
 		 * running average of the RSSI values.
-		 * Otherwise last RSSI is more representive of the
-		 * signal strength.
+		 * Otherwise new frames RSSI is more representive
+		 * of the signal strength.
 		 */
 		time_gap =
-			scan_entry->rssi_timestamp -
-			scan_params->rssi_timestamp;
+			scan_params->scan_entry_time -
+			scan_entry->rssi_timestamp;
 		if (time_gap > WLAN_RSSI_AVERAGING_TIME)
 			scan_params->avg_rssi =
 				WLAN_RSSI_IN(scan_params->rssi_raw);
diff --git a/umac/scan/dispatcher/src/wlan_scan_utils_api.c b/umac/scan/dispatcher/src/wlan_scan_utils_api.c
index 48a2f73..2f77884 100644
--- a/umac/scan/dispatcher/src/wlan_scan_utils_api.c
+++ b/umac/scan/dispatcher/src/wlan_scan_utils_api.c
@@ -595,7 +595,7 @@
 		(le16toh(*(uint16_t *)hdr->i_seq) >> WLAN_SEQ_SEQ_SHIFT);
 
 	scan_entry->rssi_raw = rx_param->rssi;
-	scan_entry->avg_rssi = WLAN_RSSI_DUMMY_MARKER;
+	scan_entry->avg_rssi = WLAN_RSSI_IN(scan_entry->rssi_raw);
 	scan_entry->tsf_delta = rx_param->tsf_delta;
 
 	/* store jiffies */