diff --git a/src/ArduinoIoTCloudDevice.cpp b/src/ArduinoIoTCloudDevice.cpp
index 76474e12d..e693923bc 100644
--- a/src/ArduinoIoTCloudDevice.cpp
+++ b/src/ArduinoIoTCloudDevice.cpp
@@ -117,6 +117,11 @@ ArduinoCloudDevice::State ArduinoCloudDevice::handleSendCapabilities() {
     deliver(reinterpret_cast<Message*>(&deviceNetConfig));
   }
 
+#if defined(BOARD_HAS_WIFI) && not defined(BOARD_ESP)
+  String WiFiFWVersion = WiFi.firmwareVersion();
+  VersionMessage versionMessage = { WiFiFWVersionMessageId, WiFiFWVersion.c_str() };
+  deliver(reinterpret_cast<Message*>(&versionMessage));
+#endif
   /* Subscribe to device topic to request */
   ThingBeginCmd thingBegin = { ThingBeginCmdId };
   deliver(reinterpret_cast<Message*>(&thingBegin));
diff --git a/src/message/Commands.h b/src/message/Commands.h
index 2195e4395..60840231a 100644
--- a/src/message/Commands.h
+++ b/src/message/Commands.h
@@ -17,6 +17,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <interfaces/message.h>
+#include <cbor/standards/StandardMessages.h>
 #include <connectionHandlerModels/settings.h>
 
 /******************************************************************************