diff --git a/add-ons/src/mender-configure.c b/add-ons/src/mender-configure.c
index 5299c89..0bba8e1 100644
--- a/add-ons/src/mender-configure.c
+++ b/add-ons/src/mender-configure.c
@@ -406,8 +406,12 @@ mender_configure_work_function(void) {
         mender_log_error("Unable to publish configuration data");
     }
 
+#ifndef CONFIG_MENDER_CLIENT_CONFIGURE_STORAGE
+
 RELEASE:
 
+#endif /* CONFIG_MENDER_CLIENT_CONFIGURE_STORAGE */
+
     /* Release access to the network */
     mender_client_network_release();