diff --git a/i3bar/src/ipc.c b/i3bar/src/ipc.c
index 1214954d..34898663 100644
--- a/i3bar/src/ipc.c
+++ b/i3bar/src/ipc.c
@@ -17,6 +17,9 @@
 #include <sys/un.h>
 #include <i3/ipc.h>
 #include <ev.h>
+#ifdef I3_ASAN_ENABLED
+#include <sanitizer/lsan_interface.h>
+#endif
 
 #include "common.h"
 
@@ -212,6 +215,9 @@ void got_data(struct ev_loop *loop, ev_io *watcher, int events) {
             /* EOF received. Since i3 will restart i3bar instances as appropriate,
              * we exit here. */
             DLOG("EOF received, exiting...\n");
+#ifdef I3_ASAN_ENABLED
+            __lsan_do_leak_check();
+#endif
             clean_xcb();
             exit(EXIT_SUCCESS);
         }
diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c
index 590515a7..0b9f094b 100644
--- a/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@ -32,6 +32,10 @@
 #include <X11/XKBlib.h>
 #include <X11/extensions/XKB.h>
 
+#ifdef I3_ASAN_ENABLED
+#include <sanitizer/lsan_interface.h>
+#endif
+
 #include "common.h"
 #include "libi3.h"
 
@@ -1070,6 +1074,9 @@ void xcb_chk_cb(struct ev_loop *loop, ev_check *watcher, int revents) {
 
     if (xcb_connection_has_error(xcb_connection)) {
         ELOG("X11 connection was closed unexpectedly - maybe your X server terminated / crashed?\n");
+#ifdef I3_ASAN_ENABLED
+        __lsan_do_leak_check();
+#endif
         exit(1);
     }
 
diff --git a/src/commands.c b/src/commands.c
index 515b5776..525a30fc 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -12,6 +12,10 @@
 #include <float.h>
 #include <stdarg.h>
 
+#ifdef I3_ASAN_ENABLED
+#include <sanitizer/lsan_interface.h>
+#endif
+
 #include "all.h"
 #include "shmlog.h"
 
@@ -1658,6 +1662,9 @@ void cmd_layout_toggle(I3_CMD, const char *toggle_mode) {
  */
 void cmd_exit(I3_CMD) {
     LOG("Exiting due to user command.\n");
+#ifdef I3_ASAN_ENABLED
+    __lsan_do_leak_check();
+#endif
     ipc_shutdown();
     unlink(config.ipc_socket_path);
     xcb_disconnect(conn);
diff --git a/src/restore_layout.c b/src/restore_layout.c
index 4b9dc4ae..7e1b78ae 100644
--- a/src/restore_layout.c
+++ b/src/restore_layout.c
@@ -13,6 +13,10 @@
  */
 #include "all.h"
 
+#ifdef I3_ASAN_ENABLED
+#include <sanitizer/lsan_interface.h>
+#endif
+
 typedef struct placeholder_state {
     /** The X11 placeholder window. */
     xcb_window_t window;
@@ -114,6 +118,9 @@ void restore_connect(void) {
         if (restore_conn != NULL) {
             xcb_disconnect(restore_conn);
         }
+#ifdef I3_ASAN_ENABLED
+        __lsan_do_leak_check();
+#endif
         errx(EXIT_FAILURE, "Cannot open display\n");
     }