diff --git a/generators/chipyard/src/main/scala/HarnessClocks.scala b/generators/chipyard/src/main/scala/HarnessClocks.scala
index c256caba4f..f9665e12a6 100644
--- a/generators/chipyard/src/main/scala/HarnessClocks.scala
+++ b/generators/chipyard/src/main/scala/HarnessClocks.scala
@@ -21,9 +21,15 @@ trait HarnessClockInstantiator {
 
   // request a clock bundle at a particular frequency
   def requestClockBundle(name: String, freqRequested: Double): ClockBundle = {
-    val clockBundle = Wire(new ClockBundle(ClockBundleParameters()))
-    _clockMap(name) = (freqRequested, clockBundle)
-    clockBundle
+    if (_clockMap.contains(name)) {
+      require(freqRequested == _clockMap(name)._1,
+        s"Request clock freq = $freqRequested != previously requested ${_clockMap(name)._2} for requested clock $name")
+      _clockMap(name)._2
+    } else {
+      val clockBundle = Wire(new ClockBundle(ClockBundleParameters()))
+      _clockMap(name) = (freqRequested, clockBundle)
+      clockBundle
+    }
   }
 
   // refClock is the clock generated by TestDriver that is