diff --git a/src/Shared/MapMarkers/MapMarkerDatabase.swift b/src/Shared/MapMarkers/MapMarkerDatabase.swift
index f6bb351b4..bc8047261 100644
--- a/src/Shared/MapMarkers/MapMarkerDatabase.swift
+++ b/src/Shared/MapMarkers/MapMarkerDatabase.swift
@@ -38,17 +38,21 @@ final class MapMarkerDatabase: MapMarkerIgnoreListProtocol {
 		}
 		// Build a new list of markers that reference the object
 		var list = [MapMarker]()
-		for quest in QuestList.shared.questsForObject(object) {
-			if let marker = QuestMarker(object: object, quest: quest, ignorable: self) {
+		if AppDelegate.shared.mapView.viewOverlayMask.contains(.QUESTS) {
+			for quest in QuestList.shared.questsForObject(object) {
+				if let marker = QuestMarker(object: object, quest: quest, ignorable: self) {
+					addOrUpdate(marker: marker)
+					list.append(marker)
+				}
+			}
+		}
+		if AppDelegate.shared.mapView.viewOverlayMask.contains(.NOTES) {
+			if let fixme = FixmeMarker.fixmeTag(object) {
+				let marker = FixmeMarker(object: object, text: fixme)
 				addOrUpdate(marker: marker)
 				list.append(marker)
 			}
 		}
-		if let fixme = FixmeMarker.fixmeTag(object) {
-			let marker = FixmeMarker(object: object, text: fixme)
-			addOrUpdate(marker: marker)
-			list.append(marker)
-		}
 		return list
 	}