diff --git a/README.md b/README.md
index 14cc7896..2d76201c 100644
--- a/README.md
+++ b/README.md
@@ -3025,7 +3025,7 @@ plugins prevent this event from triggering by exiting Vim through an autocommand
 without using the `nested` keyword (see `:h autocmd-nested`). One of these
 plugins is [vim-nerdtree-tabs][]. You should identify which plugin is
 responsible for the issue and report it to the plugin author. Note that when
-this happens, [ycmd][] will automatically shut itself down after 3 hours.
+this happens, [ycmd][] will automatically shut itself down after 30 minutes.
 
 Contributor Code of Conduct
 ---------------------------
diff --git a/doc/youcompleteme.txt b/doc/youcompleteme.txt
index d3c2ade8..9ad76389 100644
--- a/doc/youcompleteme.txt
+++ b/doc/youcompleteme.txt
@@ -3312,7 +3312,7 @@ plugins prevent this event from triggering by exiting Vim through an
 autocommand without using the 'nested' keyword (see ':h autocmd-nested'). One
 of these plugins is vim-nerdtree-tabs [68]. You should identify which plugin is
 responsible for the issue and report it to the plugin author. Note that when
-this happens, ycmd [43] will automatically shut itself down after 3 hours.
+this happens, ycmd [43] will automatically shut itself down after 30 minutes.
 
 ===============================================================================
                                     *youcompleteme-contributor-code-of-conduct*
diff --git a/python/ycm/youcompleteme.py b/python/ycm/youcompleteme.py
index c5850ed7..d584c926 100644
--- a/python/ycm/youcompleteme.py
+++ b/python/ycm/youcompleteme.py
@@ -99,7 +99,7 @@ CORE_PYTHON3_MESSAGE = (
 CORE_OUTDATED_MESSAGE = (
   'YCM core library too old; PLEASE RECOMPILE by running the install.py '
   'script. See the documentation for more details.' )
-SERVER_IDLE_SUICIDE_SECONDS = 10800  # 3 hours
+SERVER_IDLE_SUICIDE_SECONDS = 1800  # 30 minutes
 DIAGNOSTIC_UI_FILETYPES = set( [ 'cpp', 'cs', 'c', 'objc', 'objcpp',
                                  'typescript' ] )
 CLIENT_LOGFILE_FORMAT = 'ycm_'