diff --git a/hal/src/main/native/include/HAL/cpp/fpga_clock.h b/hal/src/main/native/include/HAL/cpp/fpga_clock.h
index d89638c457..b5edfd78da 100644
--- a/hal/src/main/native/include/HAL/cpp/fpga_clock.h
+++ b/hal/src/main/native/include/HAL/cpp/fpga_clock.h
@@ -22,11 +22,10 @@ class fpga_clock {
   static fpga_clock::time_point now() noexcept;
   static constexpr bool is_steady = true;
 
-  static constexpr fpga_clock::time_point epoch() { return time_point(zero()); }
+  static fpga_clock::time_point epoch() noexcept { return time_point(zero()); }
 
-  static constexpr fpga_clock::duration zero() { return duration(0); }
+  static fpga_clock::duration zero() noexcept { return duration(0); }
 
-  static constexpr time_point min_time{
-      time_point(duration(std::numeric_limits<duration::rep>::min()))};
+  static const time_point min_time;
 };
 }  // namespace hal
diff --git a/hal/src/main/native/shared/cpp/fpga_clock.cpp b/hal/src/main/native/shared/cpp/fpga_clock.cpp
index 4ce3311962..22b1915a40 100644
--- a/hal/src/main/native/shared/cpp/fpga_clock.cpp
+++ b/hal/src/main/native/shared/cpp/fpga_clock.cpp
@@ -11,7 +11,9 @@
 #include "llvm/raw_ostream.h"
 
 namespace hal {
-constexpr fpga_clock::time_point fpga_clock::min_time;
+const fpga_clock::time_point fpga_clock::min_time =
+    fpga_clock::time_point(fpga_clock::duration(
+        std::numeric_limits<fpga_clock::duration::rep>::min()));
 
 fpga_clock::time_point fpga_clock::now() noexcept {
   int32_t status = 0;