diff --git a/module/other/register-helpers.js b/module/other/register-helpers.js
index 58e25f9..1356dde 100644
--- a/module/other/register-helpers.js
+++ b/module/other/register-helpers.js
@@ -254,8 +254,4 @@ export default function registerHandlebarsHelpers() {
 
     return result;
   });
-
-  Handlebars.registerHelper("hideSkillTooltips", () => {
-    return game.settings.get("deltagreen", "hideSkillTooltips");
-  });
 }
diff --git a/module/sheets/base-actor-sheet.js b/module/sheets/base-actor-sheet.js
index 657213e..7b1227c 100644
--- a/module/sheets/base-actor-sheet.js
+++ b/module/sheets/base-actor-sheet.js
@@ -83,8 +83,16 @@ export default class DGActorSheet extends DGSheetMixin(ActorSheetV2) {
     this._sortSkills();
     this._sortCustomSkills();
 
-    // Setup tooltips
-    this._prepareSkillTooltips();
+    // Wether to hide skill tooltips
+    context.hideSkillTooltips = game.settings.get(
+      "deltagreen",
+      "hideSkillTooltips",
+    );
+
+    if (!context.hideSkillTooltips) {
+      // Setup tooltips
+      this._prepareSkillTooltips();
+    }
 
     // Set sanity block per actor type.
     context.sanityInputs = await foundry.applications.handlebars.renderTemplate(
diff --git a/templates/actor/parts/skills-tab.html b/templates/actor/parts/skills-tab.html
index 456794b..9b561d6 100644
--- a/templates/actor/parts/skills-tab.html
+++ b/templates/actor/parts/skills-tab.html
@@ -24,7 +24,7 @@
                        data-key="{{skill.key}}"
                        data-rolltype="skill"
                        for="system.skills.{{skill.key}}.value"
-                       {{#unless (hideSkillTooltips) }}
+                       {{#unless ../hideSkillTooltips }}
                        data-tooltip="{{ skill.tooltip }}"
                        {{/unless }}
                 >