diff --git a/xos/core/xoslib/methods/vpnview.py b/xos/core/xoslib/methods/vpnview.py
index be8d7fc..bf8231d 100644
--- a/xos/core/xoslib/methods/vpnview.py
+++ b/xos/core/xoslib/methods/vpnview.py
@@ -52,8 +52,9 @@
         env = jinja2.Environment(loader=jinja2.FileSystemLoader("/opt/xos/services/vpn/templates"))
         template = env.get_template("connect.vpn.j2")
         client_name = self.context['request'].user.email + "-" + str(obj.id)
-        remotes = VPNTenant.get_tenant_objects().filter(pk__in=obj.failover_server_ids)
-        remotes.insert(0, obj)
+        remote_ids = list(obj.failover_server_ids)
+        remote_ids.insert(0, obj.id)
+        remotes = VPNTenant.get_tenant_objects().filter(pk__in=remote_ids)
         pki_dir = VPNService.get_pki_dir(obj)
         fields = {"client_name": client_name,
                   "remotes": remotes,