diff --git a/src/thread/cancellation.c b/src/thread/cancellation.c
index 967705a910a4213b48be5f3ab79e2816cb501c93..23d23d14ef2c63683f44662ed2cb48c5771ac906 100644
--- a/src/thread/cancellation.c
+++ b/src/thread/cancellation.c
@@ -11,6 +11,7 @@ void _pthread_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
 void _pthread_cleanup_pop(struct __ptcb *cb, int run)
 {
 	__do_cleanup_pop(cb, run);
+	if (run) cb->__f(cb->__x);
 }
 
 static void dummy()
diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index 87bf8166ff85242ad890e0832cdc07c3399b7972..d84e50a96deaaf19e1a79fea198422e49535cde4 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -55,7 +55,6 @@ void __do_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
 void __do_cleanup_pop(struct __ptcb *cb, int run)
 {
 	__pthread_self()->cancelbuf = cb->__next;
-	if (run) cb->__f(cb->__x);
 }
 
 static int start(void *p)