diff --git a/core/core-emacs-backports.el b/core/core-emacs-backports.el
index 60a8945fe..f92fbc756 100644
--- a/core/core-emacs-backports.el
+++ b/core/core-emacs-backports.el
@@ -15,8 +15,11 @@
 
 (when (and (version<  "25" emacs-version)
            (version< emacs-version "26.3"))
-  ;; backport fix for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34341
-  (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3"))
+  ;; Hack to prevent TLS error with Emacs 26.1 and 26.2 and gnutls 3.6.4 and above
+  ;; see https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34341
+  (with-current-buffer (url-retrieve-synchronously "https://api.github.com/users/syl20bnr/repos")
+    (when (string-empty-p (buffer-string))
+      (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3"))))
 
 (when (version< emacs-version "26")
   ;; backport fix for macOS battery status