diff --git a/examples/Tools/SerialNINAPassthrough/SerialNINAPassthrough.ino b/examples/Tools/SerialNINAPassthrough/SerialNINAPassthrough.ino
index 6d85b3b6..cf46e67e 100644
--- a/examples/Tools/SerialNINAPassthrough/SerialNINAPassthrough.ino
+++ b/examples/Tools/SerialNINAPassthrough/SerialNINAPassthrough.ino
@@ -47,7 +47,7 @@ void setup() {
   pinMode(NINA_RESETN, OUTPUT);
 #endif
 
-#ifdef ARDUINO_AVR_UNO_WIFI_REV2
+#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ARDUINO_NANO_RP2040_CONNECT)
   // manually put the NINA in upload mode
   digitalWrite(NINA_GPIO0, LOW);
 
@@ -60,7 +60,7 @@ void setup() {
 }
 
 void loop() {
-#ifndef ARDUINO_AVR_UNO_WIFI_REV2
+#if !defined(ARDUINO_AVR_UNO_WIFI_REV2) && !defined(ARDUINO_NANO_RP2040_CONNECT)
   if (rts != Serial.rts()) {
 #ifdef ARDUINO_SAMD_MKRVIDOR4000
     FPGA.digitalWrite(FPGA_SPIWIFI_RESET, (Serial.rts() == 1) ? LOW : HIGH);
@@ -90,7 +90,7 @@ void loop() {
     Serial.write(SerialNina.read());
   }
 
-#ifndef ARDUINO_AVR_UNO_WIFI_REV2
+#if !defined(ARDUINO_AVR_UNO_WIFI_REV2) && !defined(ARDUINO_NANO_RP2040_CONNECT)
   // check if the USB virtual serial wants a new baud rate
   if (Serial.baud() != baud) {
     rts = -1;
diff --git a/library.properties b/library.properties
index b54dcb53..54dc6f40 100644
--- a/library.properties
+++ b/library.properties
@@ -6,6 +6,6 @@ sentence=Enables network connection (local and Internet) with the Arduino MKR Wi
 paragraph=With this library you can instantiate Servers, Clients and send/receive UDP packets through WiFi. The board can connect either to open or encrypted networks (WEP, WPA). The IP address can be assigned statically or through a DHCP. The library can also manage DNS.
 category=Communication
 url=http://www.arduino.cc/en/Reference/WiFiNINA
-architectures=samd,mbed_nano,megaavr
+architectures=samd,mbed_rp2040,megaavr,zephyr,zephyr_main
 includes=WiFiNINA.h
 depends=Arduino_SpiNINA