diff --git a/arch/rp2040/rp2040.ini b/arch/rp2040/rp2040.ini
index f30a94d3d..c41f92892 100644
--- a/arch/rp2040/rp2040.ini
+++ b/arch/rp2040/rp2040.ini
@@ -1,8 +1,6 @@
 ; Common settings for rp2040 Processor based targets
 [rp2040_base]
-platform = https://github.com/maxgerhardt/platform-raspberrypi.git#20c7dbfcfe6677c5305fa28ecf5e3870321cb157
-platform_packages = 
-  earlephilhower/toolchain-rp2040-earlephilhower@^5.100300.221223
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#9f8c10e50b5acd18e7bfd32638199c655be73a5b
 extends = arduino_base
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
diff --git a/src/mesh/FloodingRouter.cpp b/src/mesh/FloodingRouter.cpp
index 1498bbeab..d0925d0a1 100644
--- a/src/mesh/FloodingRouter.cpp
+++ b/src/mesh/FloodingRouter.cpp
@@ -59,11 +59,6 @@ void FloodingRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtas
             LOG_DEBUG("Ignoring a simple (0 id) broadcast\n");
         }
     }
-
-    if (config.device.rebroadcast_mode == meshtastic_Config_DeviceConfig_RebroadcastMode_LOCAL_ONLY) {
-        LOG_DEBUG("Cancelling rebroadcast of message from node on a foreign mesh, due to local only rebroadcast mode\n");
-        Router::cancelSending(p->to, p->decoded.request_id);
-    }
     // handle the packet as normal
     Router::sniffReceived(p, c);
 }
diff --git a/src/modules/RoutingModule.cpp b/src/modules/RoutingModule.cpp
index f91d32a20..d81311481 100644
--- a/src/modules/RoutingModule.cpp
+++ b/src/modules/RoutingModule.cpp
@@ -46,5 +46,5 @@ void RoutingModule::sendAckNak(meshtastic_Routing_Error err, NodeNum to, PacketI
 RoutingModule::RoutingModule() : ProtobufModule("routing", meshtastic_PortNum_ROUTING_APP, &meshtastic_Routing_msg)
 {
     isPromiscuous = true;
-    encryptedOk = true;
+    encryptedOk = config.device.rebroadcast_mode != meshtastic_Config_DeviceConfig_RebroadcastMode_LOCAL_ONLY;
 }
diff --git a/src/platform/rp2040/rp2040CryptoEngine.cpp b/src/platform/rp2040/rp2040CryptoEngine.cpp
index c90126cc7..bb1c00779 100644
--- a/src/platform/rp2040/rp2040CryptoEngine.cpp
+++ b/src/platform/rp2040/rp2040CryptoEngine.cpp
@@ -1,6 +1,6 @@
+#include "configuration.h"
 #include "CryptoEngine.h"
 #include "aes.hpp"
-#include "configuration.h"
 
 class RP2040CryptoEngine : public CryptoEngine
 {