diff --git a/db/dohsql.c b/db/dohsql.c
index cfdc83a751..538dbd9940 100644
--- a/db/dohsql.c
+++ b/db/dohsql.c
@@ -1030,6 +1030,8 @@ static int _shard_connect(struct sqlclntstate *clnt, dohsql_connector_t *conn,
     conn->clnt->origin = clnt->origin;
     conn->clnt->current_user = clnt->current_user;
     conn->clnt->sql = strdup(sql);
+    conn->clnt->authdata = clnt->authdata;
+    conn->clnt->argv0 = clnt->argv0;
     memcpy(conn->clnt->tzname, clnt->tzname, sizeof(clnt->tzname));
     make_dohsql_plugin(conn->clnt);
     conn->clnt->plugin.state = conn;
@@ -1073,6 +1075,8 @@ static void _shard_disconnect(dohsql_connector_t *conn)
     Pthread_mutex_lock(&clnt_lk);
     free(clnt->sql);
     clnt->sql = NULL;
+    clnt->authdata = NULL;
+    clnt->argv0 = NULL;
     Pthread_mutex_unlock(&clnt_lk);
     cleanup_clnt(clnt);
     free(clnt);