diff --git a/resources/lib/plex_companion.py b/resources/lib/plex_companion.py
index 53a73c4c..ad9ae747 100644
--- a/resources/lib/plex_companion.py
+++ b/resources/lib/plex_companion.py
@@ -293,7 +293,7 @@ class PlexCompanion(backgroundthread.KillableThread):
                         subscription_manager,
                         ('', v.COMPANION_PORT),
                         listener.MyHandler)
-                    httpd.timeout = 0.95
+                    httpd.timeout = 10.0
                     break
                 except Exception:
                     LOG.error("Unable to start PlexCompanion. Traceback:")
diff --git a/resources/lib/plexbmchelper/listener.py b/resources/lib/plexbmchelper/listener.py
index 00b0cb4b..a5c6ecd1 100644
--- a/resources/lib/plexbmchelper/listener.py
+++ b/resources/lib/plexbmchelper/listener.py
@@ -37,6 +37,7 @@ RESOURCES_XML = ('%s<MediaContainer>\n'
                               v.PLATFORM,
                               v.PLATFORM_VERSION)
 
+
 class MyHandler(BaseHTTPRequestHandler):
     """
     BaseHTTPRequestHandler implementation of Plex Companion listener