diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 38cbf6c5..778fa242 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -3738,6 +3738,7 @@ class WebInterface(object):
         else:
             return {'result': 'error', 'message': 'Failed to delete device.'}
 
+    @cherrypy.config(**{'response.timeout': 3600})
     @cherrypy.expose
     @cherrypy.tools.json_out()
     @requireAuth(member_of("admin"))
diff --git a/plexpy/webstart.py b/plexpy/webstart.py
index 1b89b896..c34ac878 100644
--- a/plexpy/webstart.py
+++ b/plexpy/webstart.py
@@ -89,6 +89,8 @@ def initialize(options):
         'server.socket_host': options['http_host'],
         'environment': options['http_environment'],
         'server.thread_pool': 10,
+        'server.max_request_body_size': 1073741824,
+        'server.socket_timeout': 60,
         'tools.encode.on': True,
         'tools.encode.encoding': 'utf-8',
         'tools.decode.on': True