diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c
index 45e5dc5..975a263 100644
--- a/openbsc/src/libmsc/gsm_04_11.c
+++ b/openbsc/src/libmsc/gsm_04_11.c
@@ -561,11 +561,6 @@
 	sms_free(sms);
 	trans->sms.sms = NULL;
 
-	/* check for more messages for this subscriber */
-	sms = db_sms_get_unsent_for_subscr(trans->subscr);
-	if (sms)
-		gsm411_send_sms(trans->conn, sms);
-
 	return 0;
 }
 
@@ -615,7 +610,6 @@
 static int gsm411_rx_rp_smma(struct msgb *msg, struct gsm_trans *trans,
 			     struct gsm411_rp_hdr *rph)
 {
-	struct gsm_sms *sms;
 	int rc;
 
 	rc = gsm411_send_rp_ack(trans, rph->msg_ref);
@@ -625,11 +619,6 @@
 	 * transfer those */
 	send_signal(S_SMS_SMMA, trans, NULL, 0);
 
-	/* check for more messages for this subscriber */
-	sms = db_sms_get_unsent_for_subscr(trans->subscr);
-	if (sms)
-		gsm411_send_sms(trans->conn, sms);
-
 	return rc;
 }
 
diff --git a/openbsc/src/libmsc/sms_queue.c b/openbsc/src/libmsc/sms_queue.c
index c8745c3..b775327 100644
--- a/openbsc/src/libmsc/sms_queue.c
+++ b/openbsc/src/libmsc/sms_queue.c
@@ -380,6 +380,7 @@
 
 	/* We got a new SMS and maybe should launch the queue again. */
 	if (signal == S_SMS_SUBMITTED || signal == S_SMS_SMMA) {
+		/* TODO: For SMMA we might want to re-use the radio connection. */
 		sms_queue_trigger(network->sms_queue);
 		return 0;
 	}
@@ -399,15 +400,14 @@
 
 	switch (signal) {
 	case S_SMS_DELIVERED:
-		/*
-		 * Create place for a new SMS but keep the pending data
-		 * so we will not attempt to send the SMS for this subscriber
-		 * as we still have an open channel and will attempt to submit
-		 * SMS to it anyway.
-		 */
 		network->sms_queue->pending -= 1;
-		sms_submit_pending(network->sms_queue);
 		sms_pending_free(pending);
+		/*
+		 * TODO: we could specially make sure to re-use the existing
+		 * radio connection here. Maybe something like the readyForSM
+		 * code.
+		 */
+		sms_submit_pending(network->sms_queue);
 		break;
 	case S_SMS_MEM_EXCEEDED:
 		network->sms_queue->pending -= 1;