diff --git a/wpilibc/src/main/native/cpp/I2C.cpp b/wpilibc/src/main/native/cpp/I2C.cpp
index 106c62c247..95d5ecf051 100644
--- a/wpilibc/src/main/native/cpp/I2C.cpp
+++ b/wpilibc/src/main/native/cpp/I2C.cpp
@@ -17,13 +17,6 @@ I2C::I2C(Port port, int deviceAddress)
     : m_port(static_cast<HAL_I2CPort>(port)), m_deviceAddress(deviceAddress) {
   int32_t status = 0;
 
-  if (port == I2C::Port::kOnboard) {
-    FRC_ReportWarning(
-        "Onboard I2C port is subject to system lockups. See Known "
-        "Issues page for "
-        "details");
-  }
-
   HAL_InitializeI2C(m_port, &status);
   FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(port));
 
diff --git a/wpilibc/src/main/native/include/frc/ADXL345_I2C.h b/wpilibc/src/main/native/include/frc/ADXL345_I2C.h
index 4c6d9dffe2..924fbb110d 100644
--- a/wpilibc/src/main/native/include/frc/ADXL345_I2C.h
+++ b/wpilibc/src/main/native/include/frc/ADXL345_I2C.h
@@ -18,10 +18,6 @@ namespace frc {
  * This class allows access to a Analog Devices ADXL345 3-axis accelerometer on
  * an I2C bus. This class assumes the default (not alternate) sensor address of
  * 0x1D (7-bit address).
- *
- * The Onboard I2C port is subject to system lockups. See <a
- * href="https://docs.wpilib.org/en/stable/docs/yearly-overview/known-issues.html#onboard-i2c-causing-system-lockups">
- * WPILib Known Issues</a> page for details.
  */
 class ADXL345_I2C : public nt::NTSendable,
                     public wpi::SendableHelper<ADXL345_I2C> {
diff --git a/wpilibc/src/main/native/include/frc/I2C.h b/wpilibc/src/main/native/include/frc/I2C.h
index a842457988..41314fbf56 100644
--- a/wpilibc/src/main/native/include/frc/I2C.h
+++ b/wpilibc/src/main/native/include/frc/I2C.h
@@ -16,10 +16,6 @@ namespace frc {
  *
  * This class is intended to be used by sensor (and other I2C device) drivers.
  * It probably should not be used directly.
- *
- * The Onboard I2C port is subject to system lockups. See <a
- * href="https://docs.wpilib.org/en/stable/docs/yearly-overview/known-issues.html#onboard-i2c-causing-system-lockups">
- * WPILib Known Issues</a> page for details.
  */
 class I2C {
  public:
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java
index df5ee80db6..19ce55555e 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java
@@ -18,13 +18,7 @@ import edu.wpi.first.util.sendable.SendableRegistry;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-/**
- * ADXL345 I2C Accelerometer.
- *
- * <p>The Onboard I2C port is subject to system lockups. See <a
- * href="https://docs.wpilib.org/en/stable/docs/yearly-overview/known-issues.html#onboard-i2c-causing-system-lockups">
- * WPILib Known Issues</a> page for details.
- */
+/** ADXL345 I2C Accelerometer. */
 @SuppressWarnings("TypeName")
 public class ADXL345_I2C implements NTSendable, AutoCloseable {
   /** Default I2C device address. */
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java
index 1ed131b2c7..acb21bc0f0 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java
@@ -17,10 +17,6 @@ import java.nio.ByteBuffer;
  *
  * <p>This class is intended to be used by sensor (and other I2C device) drivers. It probably should
  * not be used directly.
- *
- * <p>The Onboard I2C port is subject to system lockups. See <a
- * href="https://docs.wpilib.org/en/stable/docs/yearly-overview/known-issues.html#onboard-i2c-causing-system-lockups">
- * WPILib Known Issues</a> page for details.
  */
 public class I2C implements AutoCloseable {
   /** I2C connection ports. */
@@ -51,12 +47,6 @@ public class I2C implements AutoCloseable {
     m_port = port.value;
     m_deviceAddress = deviceAddress;
 
-    if (port == I2C.Port.kOnboard) {
-      DriverStation.reportWarning(
-          "Onboard I2C port is subject to system lockups. See Known Issues page for details",
-          false);
-    }
-
     I2CJNI.i2CInitialize((byte) port.value);
 
     HAL.report(tResourceType.kResourceType_I2C, deviceAddress);