diff --git a/src/subscriptions.c b/src/subscriptions.c
index a77987a4..193dd213 100644
--- a/src/subscriptions.c
+++ b/src/subscriptions.c
@@ -779,9 +779,12 @@ subscription_create_from_mux
   sm = streaming_msg_create_data(SMT_START, ss);
   streaming_target_deliver(s->ths_output, sm);
 
+  r = (mi->mi_get_grace ? mi->mi_get_grace(mi, mm) : 0) + 20;
+  sm = streaming_msg_create_code(SMT_GRACE, r);
+  streaming_target_deliver(s->ths_output, sm);
+
   pthread_mutex_unlock(&mi->mi_output_lock);
 
-  r = (mi->mi_get_grace ? mi->mi_get_grace(mi, mm) : 0) + 20;
   gtimer_arm(&s->ths_receive_timer, mux_data_timeout, s, r);
 
   return s;