diff --git a/src/callmodel.cpp b/src/callmodel.cpp
index 9b2379998abadbfe5ee542bab6973f00ff5abd0a..bbd491539210ffc662d41f6d50f414c6d917d053 100644
--- a/src/callmodel.cpp
+++ b/src/callmodel.cpp
@@ -842,6 +842,11 @@ void CallModelPrivate::removeConference(Call* call)
       return;
    }
    removeCall(call,true);
+
+   // currently the daemon does not emit a  Call/Conference changed signal to indicate that the
+   // conference is over so we change the conf state here (since this is called when we get the
+   // "removeConference" signal from the daemon)
+   call->d_ptr->changeCurrentState(Call::State::OVER);
 }
 
 
diff --git a/src/private/videorenderermanager.cpp b/src/private/videorenderermanager.cpp
index 72ba64e9b3b5dc6aaf322bf1dceb44fa4c6d78e1..75e67de71cce754de98549fe5004d3550a360fed 100644
--- a/src/private/videorenderermanager.cpp
+++ b/src/private/videorenderermanager.cpp
@@ -334,7 +334,7 @@ void VideoRendererManagerPrivate::removeRenderer(Video::Renderer* r)
            t->deleteLater();
        }
 
-       delete r;
+       r->deleteLater();
    }
 }