diff --git a/src/amf/event.c b/src/amf/event.c
index b798ad1f7..8871003e1 100644
--- a/src/amf/event.c
+++ b/src/amf/event.c
@@ -128,7 +128,7 @@ void amf_sctp_event_push(amf_event_e id,
     }
 #if HAVE_USRSCTP
     else {
-        ogs_pollset_notify(amf_self()->pollset);
+        ogs_pollset_notify(ogs_app()->pollset);
     }
 #endif
 }
diff --git a/src/upf/event.c b/src/upf/event.c
index 29cc85684..10bd3075c 100644
--- a/src/upf/event.c
+++ b/src/upf/event.c
@@ -44,7 +44,13 @@ void upf_event_init(void)
     ogs_pool_init(&pool, ogs_app()->pool.event);
 
 #if defined(HAVE_KQUEUE)
+    ogs_assert(ogs_app()->pollset);
+    ogs_pollset_destroy(ogs_app()->pollset);
+
     pollset_action_setup();
+
+    ogs_app()->pollset = ogs_pollset_create(ogs_app()->pool.socket);
+    ogs_assert(ogs_app()->pollset);
 #endif
 }