diff --git a/ffplayout-engine/src/input/playlist.rs b/ffplayout-engine/src/input/playlist.rs
index 44175456..a2c317d4 100644
--- a/ffplayout-engine/src/input/playlist.rs
+++ b/ffplayout-engine/src/input/playlist.rs
@@ -268,12 +268,12 @@ impl CurrentProgram {
 
             trace!("Clip from init: {}", node_clone.source);
 
-            // Important! When no manual drop is happen here, lock is still active in handle_list_init
-            drop(nodes);
-
             node_clone.seek += time_sec
                 - (node_clone.begin.unwrap() - *self.playout_stat.time_shift.lock().unwrap());
 
+            // Important! When no manual drop is happen here, lock is still active in handle_list_init
+            drop(nodes);
+
             self.current_node = handle_list_init(
                 &self.config,
                 node_clone,
@@ -703,14 +703,11 @@ fn handle_list_init(
 ) -> Media {
     debug!("Playlist init");
     let (_, total_delta) = get_delta(config, &node.begin.unwrap());
-    let mut out = node.out;
 
     if node.out - node.seek > total_delta {
-        out = total_delta + node.seek;
+        node.out = total_delta + node.seek;
     }
 
-    node.out = out;
-
     gen_source(config, node, playout_stat, player_control, last_index)
 }