diff --git a/openbsc/src/gprs/gprs_gsup_client.c b/openbsc/src/gprs/gprs_gsup_client.c
index 5209900..aaf3017 100644
--- a/openbsc/src/gprs/gprs_gsup_client.c
+++ b/openbsc/src/gprs/gprs_gsup_client.c
@@ -46,6 +46,9 @@
 		osmo_timer_del(&gsupc->connect_timer);
 	}
 
+	if (ipa_client_conn_clear_queue(gsupc->link) > 0)
+		LOGP(DLINP, LOGL_DEBUG, "GSUP connect: discarded stored messages\n");
+
 	rc = ipa_client_conn_open(gsupc->link);
 
 	if (rc >= 0)
@@ -181,6 +184,11 @@
 		return -ENOTCONN;
 	}
 
+	if (!gsupc->is_connected) {
+		msgb_free(msg);
+		return -EAGAIN;
+	}
+
 	ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_GSUP);
 	ipa_msg_push_header(msg, IPAC_PROTO_OSMO);
 	ipa_client_conn_send(gsupc->link, msg);