diff --git a/src/remote/remote_daemon.h b/src/remote/remote_daemon.h
index 4467f71da910b0a3bcc609cd1724ce10a5af1047..31f433c15d5a0ae0fd2847d10f8631b319ec7618 100644
--- a/src/remote/remote_daemon.h
+++ b/src/remote/remote_daemon.h
@@ -74,6 +74,7 @@ struct daemonClientPrivate {
      * called, it will be set back to NULL if that succeeds.
      */
     virConnectPtr conn;
+    virConnectPtr interfaceConn;
 
     daemonClientStreamPtr streams;
 };
diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c
index 853e63901b82d6799c7ac70dd922f0234a8bd78e..34c140e6133374e706f23032cd19aa61443147fd 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -1745,6 +1745,8 @@ void remoteClientFree(void *data)
 
     if (priv->conn)
         virConnectClose(priv->conn);
+    if (priv->interfaceConn)
+        virConnectClose(priv->interfaceConn);
 
     VIR_FREE(priv);
 }
@@ -1817,6 +1819,8 @@ remoteDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED,
     if (priv->conn == NULL)
         goto cleanup;
 
+    priv->interfaceConn = virObjectRef(priv->conn);
+
     /* force update the @readonly attribute which was inherited from the
      * virNetServerService object - this is important for sockets that are RW
      * by default, but do accept RO flags, e.g. TCP
diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
index d5e61f5bb8e3f77c25ba0e2b6048082754940d83..88fcd46c456ad8e456be7629f5e2f61381b5a7a2 100755
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -111,9 +111,32 @@ sub name_to_TypeName {
 }
 
 sub get_conn_arg {
+    my $proc = shift;
+    my $args = shift;
+    my $rets = shift;
+
     if ($structprefix eq "admin") {
         return "priv->dmn";
     }
+
+    my @types;
+    push @types, @{$args} if $args;
+    push @types, @{$rets} if $rets;
+
+    # This correctly detects most APIs
+    foreach my $type (@types) {
+        if ($type =~ /remote_nonnull_interface/) {
+            return "priv->interfaceConn";
+        }
+    }
+
+    # This is for the few virConnect APIs that
+    # return things which aren't objects. eg list
+    # of pool names, or number of pools.
+    if ($proc =~ /Connect.*Interface/ || $proc =~ /InterfaceChange/) {
+        return "priv->interfaceConn";
+    }
+
     return "priv->conn";
 }
 
@@ -481,7 +504,7 @@ elsif ($mode eq "server") {
         my @free_list = ();
         my @free_list_on_error = ("virNetMessageSaveError(rerr);");
 
-        my $conn = get_conn_arg();
+        my $conn = get_conn_arg($call->{ProcName}, $call->{args_members}, $call->{ret_members});
 
         # handle arguments to the function
         if ($argtype ne "void") {