diff --git a/node/src/module.c b/node/src/module.c
index cc9c2c7a5..725a9e817 100644
--- a/node/src/module.c
+++ b/node/src/module.c
@@ -2936,7 +2936,8 @@ NAPI_METHOD(dcn_accounts_unref) {
     dcn_accounts->event_handler_thread = 0;
   }
   if (dcn_accounts->jsonrpc_instance) {
-    dc_json_api_unref(dcn_accounts->jsonrpc_instance);
+    dc_json_request(dcn_accounts->jsonrpc_instance, "{}");
+    uv_thread_join(&dcn_accounts->jsonrpc_thread);
     dcn_accounts->jsonrpc_instance = NULL;
   }
   dc_accounts_unref(dcn_accounts->dc_accounts);
@@ -3255,10 +3256,6 @@ static void accounts_jsonrpc_thread_func(void* arg)
   TRACE("accounts_jsonrpc_thread_func starting");
   char* response;
   while (true) {
-    if (dcn_accounts->jsonrpc_instance == NULL) {
-      TRACE("jsonrpc is null, bailing");
-      break;
-    }
     response = dc_get_next_json_response(dcn_accounts->jsonrpc_instance);
     if (response == NULL) {
       // done or broken