diff --git a/plugins/sip/calls-sip-call.c b/plugins/sip/calls-sip-call.c
index 268bcd4..6e0023b 100644
--- a/plugins/sip/calls-sip-call.c
+++ b/plugins/sip/calls-sip-call.c
@@ -462,5 +462,5 @@ calls_sip_call_set_codecs (CallsSipCall *self,
   g_return_if_fail (codecs);
 
   g_list_free (self->codecs);
-  self->codecs = codecs;
+  self->codecs = g_list_copy (codecs);
 }
diff --git a/plugins/sip/calls-sip-origin.c b/plugins/sip/calls-sip-origin.c
index ba9d7e1..e628b59 100644
--- a/plugins/sip/calls-sip-origin.c
+++ b/plugins/sip/calls-sip-origin.c
@@ -518,7 +518,7 @@ sip_i_state (int              status,
    * also: rtcp port = rtp port + 1
    */
   if (r_sdp) {
-    GList *codecs =
+    g_autoptr (GList) codecs =
       calls_sip_media_manager_get_codecs_from_sdp (origin->media_manager,
                                                    r_sdp->sdp_media);