diff --git a/libraries/AP_Logger/AP_Logger.h b/libraries/AP_Logger/AP_Logger.h
index f012585198..f7d7057bfb 100644
--- a/libraries/AP_Logger/AP_Logger.h
+++ b/libraries/AP_Logger/AP_Logger.h
@@ -7,7 +7,6 @@
 #include <AP_Common/AP_Common.h>
 #include <AP_Param/AP_Param.h>
 #include <AP_InertialSensor/AP_InertialSensor.h>
-#include <AP_RSSI/AP_RSSI.h>
 #include <AP_AHRS/AP_AHRS.h>
 #include <AP_Mission/AP_Mission.h>
 #include <AP_BattMonitor/AP_BattMonitor.h>
@@ -238,7 +237,7 @@ public:
     void Write_Vibration();
     void Write_RCIN(void);
     void Write_RCOUT(void);
-    void Write_RSSI(AP_RSSI &rssi);
+    void Write_RSSI();
     void Write_Baro(uint64_t time_us=0);
     void Write_Power(void);
     void Write_AHRS2(AP_AHRS &ahrs);
diff --git a/libraries/AP_Logger/LogFile.cpp b/libraries/AP_Logger/LogFile.cpp
index dc64b27aca..1e861fa55e 100644
--- a/libraries/AP_Logger/LogFile.cpp
+++ b/libraries/AP_Logger/LogFile.cpp
@@ -11,6 +11,7 @@
 #include <AC_AttitudeControl/AC_AttitudeControl.h>
 #include <AC_AttitudeControl/AC_PosControl.h>
 #include <AP_RangeFinder/RangeFinder_Backend.h>
+#include <AP_RSSI/AP_RSSI.h>
 
 #include "AP_Logger.h"
 #include "AP_Logger_File.h"
@@ -245,12 +246,17 @@ void AP_Logger::Write_RCOUT(void)
 }
 
 // Write an RSSI packet
-void AP_Logger::Write_RSSI(AP_RSSI &rssi)
+void AP_Logger::Write_RSSI()
 {
+    AP_RSSI *rssi = AP::rssi();
+    if (rssi == nullptr) {
+        return;
+    }
+
     struct log_RSSI pkt = {
         LOG_PACKET_HEADER_INIT(LOG_RSSI_MSG),
         time_us       : AP_HAL::micros64(),
-        RXRSSI        : rssi.read_receiver_rssi()
+        RXRSSI        : rssi->read_receiver_rssi()
     };
     WriteBlock(&pkt, sizeof(pkt));
 }