diff --git a/src/schedule/zephyr_ll.c b/src/schedule/zephyr_ll.c
index 575a82d91dda..a42f20840a11 100644
--- a/src/schedule/zephyr_ll.c
+++ b/src/schedule/zephyr_ll.c
@@ -412,10 +412,12 @@ static int zephyr_ll_task_free(void *data, struct task *task)
 
 	zephyr_ll_assert_core(sch);
 
+#ifndef CONFIG_SOF_USERSPACE_LL
 	if (k_is_in_isr()) {
 		tr_err(&ll_tr, "cannot free tasks from interrupt context!");
 		return -EDEADLK;
 	}
+#endif
 
 	zephyr_ll_lock(sch, &flags);
 
diff --git a/zephyr/wrapper.c b/zephyr/wrapper.c
index c0c167b930fe..10dbc46d57ec 100644
--- a/zephyr/wrapper.c
+++ b/zephyr/wrapper.c
@@ -265,7 +265,11 @@ void platform_dai_timestamp(struct comp_dev *dai,
 /* get current wallclock for componnent */
 void platform_dai_wallclock(struct comp_dev *dai, uint64_t *wallclock)
 {
+#ifndef CONFIG_SOF_USERSPACE_LL
 	*wallclock = sof_cycle_get_64();
+#else
+	*wallclock = k_uptime_get();
+#endif
 }
 
 /*