diff --git a/openbsc/src/libcommon/oap_client.c b/openbsc/src/libcommon/oap_client.c
index e372ede..54b71e4 100644
--- a/openbsc/src/libcommon/oap_client.c
+++ b/openbsc/src/libcommon/oap_client.c
@@ -35,6 +35,9 @@
 {
 	OSMO_ASSERT(state->state == OAP_UNINITIALIZED);
 
+	if (!config)
+		goto disable;
+
 	if (config->client_id == 0)
 		goto disable;