diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index 5e6b866635..3ea4b8a5b2 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -1262,6 +1262,9 @@ void GuiPrepareTooltipsExtra(Window *parent){
 		return;
 	}
 
+	if (!_settings_client.gui.enable_extra_tooltips)
+		return;
+
 	if (tile >= MapSize()) return;
 	uint param = 0;
 	switch (GetTileType(tile)) {
diff --git a/src/viewport_gui.cpp b/src/viewport_gui.cpp
index 5ea2dd3685..424060174a 100644
--- a/src/viewport_gui.cpp
+++ b/src/viewport_gui.cpp
@@ -157,7 +157,7 @@ public:
 
 	virtual void OnMouseOver(Point pt, int widget)
 	{
-		if (_settings_client.gui.enable_extra_tooltips && pt.x != -1) GuiPrepareTooltipsExtra(this);
+		if (pt.x != -1) GuiPrepareTooltipsExtra(this);
 	}
 };