diff --git a/wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHub.cpp b/wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHub.cpp
index adf197636f..4d049b1fa3 100644
--- a/wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHub.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHub.cpp
@@ -69,6 +69,10 @@ bool ExpansionHub::IsHubConnected() const {
   return m_dataStore->m_hubConnectedSubscriber.Get(false);
 }
 
+int ExpansionHub::GetUsbId() const {
+  return m_dataStore->m_usbId;
+}
+
 bool ExpansionHub::CheckAndReserveServo(int channel) {
   int mask = 1 << channel;
   std::scoped_lock lock{m_dataStore->m_reservedLock};
diff --git a/wpilibc/src/main/native/include/wpi/hardware/expansionhub/ExpansionHub.hpp b/wpilibc/src/main/native/include/wpi/hardware/expansionhub/ExpansionHub.hpp
index 9079bbfe4a..5a89d266be 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/expansionhub/ExpansionHub.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/expansionhub/ExpansionHub.hpp
@@ -62,7 +62,7 @@ class ExpansionHub {
    *
    * @return The USB ID
    */
-  int GetUsbId() const { return m_usbId; }
+  int GetUsbId() const;
 
   static constexpr int NumUsbPorts = 4;
   static constexpr int NumServoPorts = 6;
@@ -81,7 +81,6 @@ class ExpansionHub {
   friend class DataStore;
 
   std::shared_ptr<DataStore> m_dataStore;
-  int m_usbId;
 
   static wpi::util::mutex m_handleLock;
   static std::weak_ptr<DataStore> m_storeMap[4];