diff --git a/src/init.cpp b/src/init.cpp
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -329,12 +329,14 @@
 }
 #endif
 
+static boost::signals2::connection rpc_notify_block_change_connection;
 static void OnRPCStarted() {
-    uiInterface.NotifyBlockTip_connect(&RPCNotifyBlockChange);
+    rpc_notify_block_change_connection =
+        uiInterface.NotifyBlockTip_connect(&RPCNotifyBlockChange);
 }
 
 static void OnRPCStopped() {
-    uiInterface.NotifyBlockTip_disconnect(&RPCNotifyBlockChange);
+    rpc_notify_block_change_connection.disconnect();
     RPCNotifyBlockChange(false, nullptr);
     g_best_block_cv.notify_all();
     LogPrint(BCLog::RPC, "RPC stopped.\n");
@@ -2659,8 +2661,10 @@
     // Either install a handler to notify us when genesis activates, or set
     // fHaveGenesis directly.
     // No locking, as this happens before any background thread is started.
+    boost::signals2::connection block_notify_genesis_wait_connection;
     if (::ChainActive().Tip() == nullptr) {
-        uiInterface.NotifyBlockTip_connect(BlockNotifyGenesisWait);
+        block_notify_genesis_wait_connection =
+            uiInterface.NotifyBlockTip_connect(BlockNotifyGenesisWait);
     } else {
         fHaveGenesis = true;
     }
@@ -2688,7 +2692,7 @@
         while (!fHaveGenesis && !ShutdownRequested()) {
             g_genesis_wait_cv.wait_for(lock, std::chrono::milliseconds(500));
         }
-        uiInterface.NotifyBlockTip_disconnect(BlockNotifyGenesisWait);
+        block_notify_genesis_wait_connection.disconnect();
     }
 
     if (ShutdownRequested()) {
diff --git a/src/ui_interface.h b/src/ui_interface.h
--- a/src/ui_interface.h
+++ b/src/ui_interface.h
@@ -84,8 +84,7 @@
     rtype signal_name(args);                                                   \
     using signal_name##Sig = rtype(args);                                      \
     boost::signals2::connection signal_name##_connect(                         \
-        std::function<signal_name##Sig> fn);                                   \
-    void signal_name##_disconnect(std::function<signal_name##Sig> fn);
+        std::function<signal_name##Sig> fn);
 
     /** Show message box. */
     ADD_SIGNALS_DECL_WRAPPER(ThreadSafeMessageBox, bool,
diff --git a/src/ui_interface.cpp b/src/ui_interface.cpp
--- a/src/ui_interface.cpp
+++ b/src/ui_interface.cpp
@@ -38,10 +38,6 @@
     boost::signals2::connection CClientUIInterface::signal_name##_connect(     \
         std::function<signal_name##Sig> fn) {                                  \
         return g_ui_signals.signal_name.connect(fn);                           \
-    }                                                                          \
-    void CClientUIInterface::signal_name##_disconnect(                         \
-        std::function<signal_name##Sig> fn) {                                  \
-        return g_ui_signals.signal_name.disconnect(&fn);                       \
     }
 
 ADD_SIGNALS_IMPL_WRAPPER(ThreadSafeMessageBox);