diff --git a/src/js/changelog.js b/src/js/changelog.js
index 1b9cec27..be6c12e2 100644
--- a/src/js/changelog.js
+++ b/src/js/changelog.js
@@ -1,4 +1,9 @@
 export const CHANGELOG = [
+    {
+        version: "1.1.1",
+        date: "28.05.2020",
+        entries: ["Fix crash when 'Show Hints' setting was turned on"],
+    },
     {
         version: "1.1.0",
         date: "28.05.2020",
diff --git a/src/js/game/hud/parts/waypoints.js b/src/js/game/hud/parts/waypoints.js
index d2feb47b..746145b3 100644
--- a/src/js/game/hud/parts/waypoints.js
+++ b/src/js/game/hud/parts/waypoints.js
@@ -116,7 +116,10 @@ export class HUDWaypoints extends BaseHUDPart {
         })[1];
 
         this.root.camera.downPreHandler.add(this.onMouseDown, this);
-        this.domAttach = new DynamicDomAttach(this.root, this.hintElement);
+
+        if (this.hintElement) {
+            this.domAttach = new DynamicDomAttach(this.root, this.hintElement);
+        }
 
         this.root.keyMapper.getBinding(KEYMAPPINGS.ingame.createMarker).add(this.requestCreateMarker, this);
 
@@ -168,7 +171,9 @@ export class HUDWaypoints extends BaseHUDPart {
     }
 
     update() {
-        this.domAttach.update(this.root.camera.getIsMapOverlayActive());
+        if (this.domAttach) {
+            this.domAttach.update(this.root.camera.getIsMapOverlayActive());
+        }
     }
 
     findCurrentIntersectedWaypoint() {
diff --git a/version b/version
index 1cc5f657..8cfbc905 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.1.0
\ No newline at end of file
+1.1.1
\ No newline at end of file