diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index d3d07ac5..9e11ff63 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -66,6 +66,8 @@ jobs:
             platform-name: arduino:mbed_nicla
           - fqbn: arduino:mbed_opta:opta
             platform-name: arduino:mbed_opta
+          - fqbn: arduino:mbed_giga:giga
+            platform-name: arduino:mbed_giga
 
         # Make board type-specific customizations to the matrix jobs
         include:
diff --git a/library.properties b/library.properties
index b526da69..0febe105 100644
--- a/library.properties
+++ b/library.properties
@@ -6,5 +6,5 @@ sentence=Arduino Library for network connection management (WiFi, GSM, NB, [Ethe
 paragraph=Originally part of ArduinoIoTCloud
 category=Communication
 url=https://github.com/arduino-libraries/Arduino_ConnectionHandler
-architectures=samd,esp32,esp8266,mbed,megaavr,mbed_nano,mbed_portenta,mbed_nicla,mbed_opta
+architectures=samd,esp32,esp8266,mbed,megaavr,mbed_nano,mbed_portenta,mbed_nicla,mbed_opta,mbed_giga
 depends=Arduino_DebugUtils, WiFi101, WiFiNINA, MKRGSM, MKRNB, MKRWAN
diff --git a/src/Arduino_ConnectionHandler.h b/src/Arduino_ConnectionHandler.h
index 126eaa59..2c2567e1 100644
--- a/src/Arduino_ConnectionHandler.h
+++ b/src/Arduino_ConnectionHandler.h
@@ -80,6 +80,16 @@
   #define NETWORK_CONNECTED WL_CONNECTED
 #endif
 
+#if defined(ARDUINO_GIGA)
+  #include <WiFi.h>
+  #include <WiFiUdp.h>
+
+  #define BOARD_HAS_WIFI
+  #define NETWORK_HARDWARE_ERROR WL_NO_SHIELD
+  #define NETWORK_IDLE_STATUS WL_IDLE_STATUS
+  #define NETWORK_CONNECTED WL_CONNECTED
+#endif
+
 #ifdef ARDUINO_SAMD_MKRGSM1400
   #include <MKRGSM.h>
   #define BOARD_HAS_GSM