diff --git a/src/common/gajim.py b/src/common/gajim.py
index cbe612b5a713883da26ea3640a7d4a03162c5fd3..a0eab9d846ff5867ecd6b9ccd5610af736040ba1 100644
--- a/src/common/gajim.py
+++ b/src/common/gajim.py
@@ -183,7 +183,7 @@ else:
 		HAVE_GPG = False
 
 import latex
-HAVE_LATEX = latex.check_for_latex_support()
+HAVE_LATEX = config.get('use_latex') and latex.check_for_latex_support()
 
 HAVE_INDICATOR = True
 try:
diff --git a/src/features_window.py b/src/features_window.py
index d784fc50a288906b883cc60641fd558135e54bea..b806eed88afebc86d1f85078992944c57677a515 100644
--- a/src/features_window.py
+++ b/src/features_window.py
@@ -243,7 +243,8 @@ class FeaturesWindow:
 		return sleepy.SUPPORTED
 
 	def latex_available(self):
-		return gajim.HAVE_LATEX
+		from common import latex
+		return latex.check_for_latex_support()
 
 	def pycrypto_available(self):
 		return gajim.HAVE_PYCRYPTO