diff --git a/gstreamer/src/clock.rs b/gstreamer/src/clock.rs
index cf710e67f..41a0a5df6 100644
--- a/gstreamer/src/clock.rs
+++ b/gstreamer/src/clock.rs
@@ -569,7 +569,7 @@ mod tests {
         crate::init().unwrap();
 
         let clock = SystemClock::obtain();
-        let now = clock.time().unwrap();
+        let now = clock.time();
         let id = clock.new_single_shot_id(now + 20 * ClockTime::MSECOND);
         let (res, _) = id.wait();
 
@@ -583,7 +583,7 @@ mod tests {
         let (sender, receiver) = channel();
 
         let clock = SystemClock::obtain();
-        let now = clock.time().unwrap();
+        let now = clock.time();
         let id = clock.new_single_shot_id(now + 20 * ClockTime::MSECOND);
         let res = id.wait_async(move |_, _, _| {
             sender.send(()).unwrap();
@@ -599,7 +599,7 @@ mod tests {
         crate::init().unwrap();
 
         let clock = SystemClock::obtain();
-        let now = clock.time().unwrap();
+        let now = clock.time();
         let id = clock.new_periodic_id(now + 20 * ClockTime::MSECOND, 20 * ClockTime::MSECOND);
 
         let (res, _) = id.wait();
@@ -616,7 +616,7 @@ mod tests {
         let (sender, receiver) = channel();
 
         let clock = SystemClock::obtain();
-        let now = clock.time().unwrap();
+        let now = clock.time();
         let id = clock.new_periodic_id(now + 20 * ClockTime::MSECOND, 20 * ClockTime::MSECOND);
         let res = id.wait_async(move |_, _, _| {
             let _ = sender.send(());
diff --git a/gstreamer/src/element.rs b/gstreamer/src/element.rs
index c6d46a9a0..c91411075 100644
--- a/gstreamer/src/element.rs
+++ b/gstreamer/src/element.rs
@@ -701,11 +701,7 @@ pub trait ElementExtManual: IsA<Element> + 'static {
     #[doc(alias = "get_current_clock_time")]
     #[doc(alias = "gst_element_get_current_clock_time")]
     fn current_clock_time(&self) -> Option<crate::ClockTime> {
-        if let Some(clock) = self.clock() {
-            clock.time()
-        } else {
-            crate::ClockTime::NONE
-        }
+        self.clock().as_ref().map(crate::Clock::time)
     }
 
     #[doc(alias = "gst_element_get_request_pad")]