diff --git a/daemon/call.c b/daemon/call.c
index 29e58ecd3..24ccc98b7 100644
--- a/daemon/call.c
+++ b/daemon/call.c
@@ -2261,7 +2261,7 @@ no_stats_output:
 		ps = l->data;
 
 		send_timer_put(&ps->send_timer);
-		obj_put(&ps->jb->ttq.tt_obj);
+                jb_put(&ps->jb);
 		__unkernelize(ps);
 		dtls_shutdown(ps);
 		ps->selected_sfd = NULL;
diff --git a/daemon/jitter_buffer.c b/daemon/jitter_buffer.c
index 12823b94b..081a2f85f 100644
--- a/daemon/jitter_buffer.c
+++ b/daemon/jitter_buffer.c
@@ -257,7 +257,6 @@ static void decrement_buffer(struct jitter_buffer *jb) {
 }
 
 static void set_jitter_values(struct media_packet *mp) {
-	int ret=0;
 	struct jitter_buffer *jb = mp->stream->jb;
         if(!jb || !mp->rtp)
                 return;
diff --git a/include/jitter_buffer.h b/include/jitter_buffer.h
index 6dc6b8c45..e27264a85 100644
--- a/include/jitter_buffer.h
+++ b/include/jitter_buffer.h
@@ -49,4 +49,11 @@ void jb_packet_free(struct jb_packet **jbp);
 
 void jitter_buffer_loop(void *p);
 
+INLINE void jb_put(struct jitter_buffer **jb) {
+        if (!*jb)
+                return;
+        obj_put(&(*jb)->ttq.tt_obj);
+        *jb = NULL;
+}
+
 #endif