diff --git a/src/context.c b/src/context.c
index 920db16d..28f090d4 100644
--- a/src/context.c
+++ b/src/context.c
@@ -92,9 +92,7 @@ void mqtt3_context_cleanup(struct mosquitto_db *db, struct mosquitto *context, b
 {
 	struct _mosquitto_packet *packet;
 	struct mosquitto_client_msg *msg, *next;
-#ifdef WITH_BRIDGE
 	struct mosquitto *ctx_tmp;
-#endif
 
 	if(!context) return;
 
diff --git a/src/mosquitto.c b/src/mosquitto.c
index f0826f7b..7558dabb 100644
--- a/src/mosquitto.c
+++ b/src/mosquitto.c
@@ -348,9 +348,11 @@ int main(int argc, char *argv[])
 	HASH_ITER(hh_sock, int_db.contexts_by_sock, ctxt, ctxt_tmp){
 		mqtt3_context_cleanup(&int_db, ctxt, true);
 	}
+#ifdef WITH_BRIDGE
 	HASH_ITER(hh_bridge, int_db.contexts_bridge, ctxt, ctxt_tmp){
 		mqtt3_context_cleanup(&int_db, ctxt, true);
 	}
+#endif
 	HASH_ITER(hh_for_free, int_db.contexts_for_free, ctxt, ctxt_tmp){
 		HASH_DELETE(hh_for_free, int_db.contexts_for_free, ctxt);
 		mqtt3_context_cleanup(&int_db, ctxt, true);