diff --git a/common/api/__init__.py b/common/api/__init__.py
index 45c73e2a0..2186542cb 100644
--- a/common/api/__init__.py
+++ b/common/api/__init__.py
@@ -18,8 +18,8 @@ class Api:
     return self.service.get_token(payload_extra, expiry_hours)
 
 
-def api_get(endpoint, method='GET', timeout=None, access_token=None, session=None, **params):
-  return CommaConnectApi(None).api_get(endpoint, method, timeout, access_token, session, **params)
+def api_get(endpoint, method='GET', timeout=None, access_token=None, session=None, json=None, **params):
+  return CommaConnectApi(None).api_get(endpoint, method, timeout, access_token, session, json, **params)
 
 
 def get_key_pair() -> tuple[str, str, str] | tuple[None, None, None]:
diff --git a/sunnypilot/sunnylink/athena/sunnylinkd.py b/sunnypilot/sunnylink/athena/sunnylinkd.py
index fe0a24810..3e44c8c96 100755
--- a/sunnypilot/sunnylink/athena/sunnylinkd.py
+++ b/sunnypilot/sunnylink/athena/sunnylinkd.py
@@ -12,7 +12,6 @@ import errno
 import gzip
 import json
 import os
-import ssl
 import threading
 import time
 
@@ -274,9 +273,7 @@ def startLocalProxy(global_end_event: threading.Event, remote_ws_uri: str, local
   sunnylink_api = SunnylinkApi(sunnylink_dongle_id)
 
   cloudlog.debug("athena.startLocalProxy.starting")
-  ws = create_connection(
-    remote_ws_uri, header={"Authorization": f"Bearer {sunnylink_api.get_token()}"}, enable_multithread=True, sslopt={"cert_reqs": ssl.CERT_NONE}
-  )
+  ws = create_connection(remote_ws_uri, header={"Authorization": f"Bearer {sunnylink_api.get_token()}"}, enable_multithread=True)
 
   return start_local_proxy_shim(global_end_event, local_port, ws)
 
@@ -310,8 +307,7 @@ def main(exit_event: threading.Event | None = None):
         ws_uri,
         header={"Authorization": f"Bearer {sunnylink_api.get_token()}"},
         enable_multithread=True,
-        sslopt={"cert_reqs": ssl.CERT_NONE if "localhost" in ws_uri else ssl.CERT_REQUIRED},
-        timeout=SUNNYLINK_RECONNECT_TIMEOUT_S,
+        timeout=30.0,
       )
       cloudlog.event("sunnylinkd.main.connected_ws", ws_uri=ws_uri, retries=conn_retries,
                      duration=time.monotonic() - conn_start)