diff --git a/scripts/tinytinypy b/scripts/tinytinypy
index b422934..8a3043f 100644
--- a/scripts/tinytinypy
+++ b/scripts/tinytinypy
@@ -69,9 +69,9 @@ def main():
     host = urlM['host']
     # Call api
     # TODO Support port
-    server = Connection(proto=proto, host=host)
-    server.login(args.user, passwd)
-    args.func(server, args)
+    with Connection(proto=proto, host=host) as server:
+        server.login(args.user, passwd)
+        args.func(server, args)
 
 if __name__ == "__main__":
     main()