diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim
index c1b9d4337c..425f2ef655 100644
--- a/runtime/autoload/provider/clipboard.vim
+++ b/runtime/autoload/provider/clipboard.vim
@@ -255,7 +255,7 @@ function! provider#clipboard#Executable() abort
     return s:set_clip()
   elseif executable('termux-clipboard-set')
     return s:set_termux()
-  elseif executable('tmux') && (!empty($TMUX) || 0 == jobwait([jobstart(['tmux', 'list-buffers'])], 2000)[0])
+  elseif !empty($TMUX) && executable('tmux')
     return s:set_tmux()
   elseif get(get(g:, 'termfeatures', {}), 'osc52') && &clipboard ==# ''
     " Don't use OSC 52 when 'clipboard' is set. It can be slow and cause a lot
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 6f7205753a..837558c16d 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -323,6 +323,7 @@ OPTIONS
 • 'winborder' sets the default border for |floating-windows|.
 • 'winborder' "bold" style.
 • |g:clipboard| accepts a string name to force any builtin clipboard tool.
+• |g:clipboard| autodetection only selects tmux when running inside tmux
 
 PERFORMANCE