diff --git a/gui/public/i18n/en/translation.ftl b/gui/public/i18n/en/translation.ftl
index a02c9dab35..6f1dfd7682 100644
--- a/gui/public/i18n/en/translation.ftl
+++ b/gui/public/i18n/en/translation.ftl
@@ -407,6 +407,7 @@ tracker-settings-update = Update now
 tracker-settings-update-title = Firmware version
 tracker-settings-current-version = Current
 tracker-settings-latest-version = Latest
+tracker-settings-build-date = Build Date
 
 
 ## Tracker part card info
diff --git a/gui/src/components/tracker/TrackerSettings.tsx b/gui/src/components/tracker/TrackerSettings.tsx
index ead4288e2b..bba3e36fc1 100644
--- a/gui/src/components/tracker/TrackerSettings.tsx
+++ b/gui/src/components/tracker/TrackerSettings.tsx
@@ -208,6 +208,15 @@ export function TrackerSettingsPage() {
                 Firmware version
               </Typography>
               <div className="flex gap-2 flex-col">
+                <div className="flex justify-between gap-2">
+                  <Typography id="tracker-settings-build-date" />
+                  <Typography
+                    whitespace="whitespace-pre-wrap"
+                    textAlign="text-end"
+                  >
+                    {tracker?.device?.hardwareInfo?.firmwareDate || '--'}
+                  </Typography>
+                </div>
                 <div className="flex justify-between gap-2">
                   <Typography id="tracker-settings-current-version" />
                   <Typography
diff --git a/server/core/src/main/java/dev/slimevr/protocol/datafeed/DataFeedBuilder.java b/server/core/src/main/java/dev/slimevr/protocol/datafeed/DataFeedBuilder.java
index 3c256ff2fd..529f497460 100644
--- a/server/core/src/main/java/dev/slimevr/protocol/datafeed/DataFeedBuilder.java
+++ b/server/core/src/main/java/dev/slimevr/protocol/datafeed/DataFeedBuilder.java
@@ -39,6 +39,10 @@ public static int createHardwareInfo(FlatBufferBuilder fbb, Device device) {
 			? fbb.createString(device.getManufacturer())
 			: 0;
 
+		int firmwareDateOffset = device.getFirmwareDate() != null
+			? fbb.createString(device.getFirmwareDate())
+			: 0;
+
 		int hardwareIdentifierOffset = fbb.createString(device.getHardwareIdentifier());
 
 		HardwareInfo.startHardwareInfo(fbb);
@@ -46,6 +50,8 @@ public static int createHardwareInfo(FlatBufferBuilder fbb, Device device) {
 		HardwareInfo.addManufacturer(fbb, manufacturerOffset);
 		HardwareInfo.addHardwareIdentifier(fbb, hardwareIdentifierOffset);
 
+		HardwareInfo.addFirmwareDate(fbb, firmwareDateOffset);
+
 		if (device instanceof UDPDevice udpDevice) {
 			var address = udpDevice.getIpAddress().getAddress();
 			HardwareInfo
@@ -68,6 +74,7 @@ public static int createHardwareInfo(FlatBufferBuilder fbb, Device device) {
 
 		HardwareInfo.addMcuId(fbb, device.getMcuType().getSolarType());
 		HardwareInfo.addOfficialBoardType(fbb, device.getBoardType().getSolarType());
+
 		return HardwareInfo.endHardwareInfo(fbb);
 	}
 
diff --git a/server/core/src/main/java/dev/slimevr/tracking/trackers/Device.kt b/server/core/src/main/java/dev/slimevr/tracking/trackers/Device.kt
index 79d8c79f1f..d92f60d04a 100644
--- a/server/core/src/main/java/dev/slimevr/tracking/trackers/Device.kt
+++ b/server/core/src/main/java/dev/slimevr/tracking/trackers/Device.kt
@@ -13,6 +13,7 @@ open class Device(val magSupport: Boolean = false) {
 	open val id: Int = nextLocalDeviceId.incrementAndGet()
 	open var name: String? = null
 	open var firmwareVersion: String? = null
+	open var firmwareDate: String? = null
 	open var manufacturer: String? = null
 	open val trackers: MutableMap<Int, Tracker> = ConcurrentHashMap()
 
diff --git a/server/core/src/main/java/dev/slimevr/tracking/trackers/hid/HIDCommon.kt b/server/core/src/main/java/dev/slimevr/tracking/trackers/hid/HIDCommon.kt
index 23d0a27ba1..3ff51290cc 100644
--- a/server/core/src/main/java/dev/slimevr/tracking/trackers/hid/HIDCommon.kt
+++ b/server/core/src/main/java/dev/slimevr/tracking/trackers/hid/HIDCommon.kt
@@ -280,12 +280,14 @@ class HIDCommon {
 					// Nothing to do now..
 				}
 			}
-			if (fw_date != null && fw_major != null && fw_minor != null && fw_patch != null) {
+			if (fw_date != null) {
 				val firmwareYear = 2020 + (fw_date shr 9 and 127)
 				val firmwareMonth = fw_date shr 5 and 15
 				val firmwareDay = fw_date and 31
-				val firmwareDate = String.format("%04d-%02d-%02d", firmwareYear, firmwareMonth, firmwareDay)
-				device.firmwareVersion = "$fw_major.$fw_minor.$fw_patch (Build $firmwareDate)"
+				device.firmwareDate = String.format("%04d-%02d-%02d", firmwareYear, firmwareMonth, firmwareDay)
+			}
+			if (fw_major != null && fw_minor != null && fw_patch != null) {
+				device.firmwareVersion = "$fw_major.$fw_minor.$fw_patch"
 			}
 			if (svr_status != null) {
 				val status = TrackerStatus.getById(svr_status)
diff --git a/solarxr-protocol b/solarxr-protocol
index b0147eeffa..b51232989c 160000
--- a/solarxr-protocol
+++ b/solarxr-protocol
@@ -1 +1 @@
-Subproject commit b0147eeffaa97a16400de174383c91be2ec31ab5
+Subproject commit b51232989cedc5a67f097c0b3fc8094ec7b37e1e