diff --git a/openbsc/src/bsc_api.c b/openbsc/src/bsc_api.c
index 73b29b5..a9e5f71 100644
--- a/openbsc/src/bsc_api.c
+++ b/openbsc/src/bsc_api.c
@@ -520,7 +520,7 @@
 int gsm0808_clear(struct gsm_subscriber_connection *conn)
 {
 	if (conn->ho_lchan)
-		bsc_clear_handover(conn);
+		bsc_clear_handover(conn, 1);
 
 	if (conn->secondary_lchan)
 		lchan_release(conn->secondary_lchan, 0, 1);
@@ -633,8 +633,10 @@
 	/* now give up all channels */
 	if (conn->lchan == lchan)
 		conn->lchan = NULL;
-	if (conn->ho_lchan == lchan)
+	if (conn->ho_lchan == lchan) {
+		bsc_clear_handover(conn, 0);
 		conn->ho_lchan = NULL;
+	}
 	lchan->conn = NULL;
 
 	gsm0808_clear(conn);