diff --git a/burpui/agent.py b/burpui/agent.py
index a65e5c1f..de990758 100644
--- a/burpui/agent.py
+++ b/burpui/agent.py
@@ -120,9 +120,9 @@ class BUIAgent(BUIbackend):
 
         self.cli = BurpHandler(self.vers, self.logger, self.conf)
         if not self.ssl:
-            self.sslkey = None
-            self.sslcert = None
-        self.server = StreamServer((self.bind, self.port), self.handle, keyfile=self.sslkey, certfile=self.sslcert)
+            self.server = StreamServer((self.bind, self.port), self.handle)
+        else:
+            self.server = StreamServer((self.bind, self.port), self.handle, keyfile=self.sslkey, certfile=self.sslcert)
 
     def run(self):
         try:
diff --git a/docker/docker-burp2/assets/config/burp/burp.conf b/docker/docker-burp2/assets/config/burp/burp.conf
index b9f3ece4..2cdfc180 100644
--- a/docker/docker-burp2/assets/config/burp/burp.conf
+++ b/docker/docker-burp2/assets/config/burp/burp.conf
@@ -18,7 +18,7 @@ progress_counter = 1
 # Ratelimit throttles the send speed. Specified in Megabits per second (Mb/s).
 # ratelimit = 1.5
 # Network timeout defaults to 7200 seconds (2 hours).
-network_timeout = 0
+network_timeout = 72000
 # The directory to which autoupgrade files will be downloaded.
 # To never autoupgrade, leave it commented out.
 # autoupgrade_dir=/opt/burp2/etc/autoupgrade/client