diff --git a/embassy-time/src/duration.rs b/embassy-time/src/duration.rs
index 846a9c3d..9d0bab2d 100644
--- a/embassy-time/src/duration.rs
+++ b/embassy-time/src/duration.rs
@@ -82,8 +82,17 @@ impl Duration {
     }
 
     /// Creates a duration corresponding to the specified Hz.
+    /// NOTE: Giving this function a hz >= the TICK_HZ of your platform will clamp the Duration to 1
+    /// tick. Doing so will not deadlock, but will certainly not produce the desired output.
     pub const fn from_hz(hz: u64) -> Duration {
-        Duration { ticks: TICK_HZ / hz }
+        let ticks = {
+            if hz >= TICK_HZ {
+                1
+            } else {
+                (TICK_HZ + hz / 2) / hz
+            }
+        };
+        Duration { ticks }
     }
 
     /// Adds one Duration to another, returning a new Duration or None in the event of an overflow.