diff --git a/data/core.yaml b/data/core.yaml
index 5de2517ba..c8e85f958 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -278,7 +278,9 @@ en:
     untagged_area: Untagged area
     many_deletions: "You're deleting {n} objects. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org."
     tag_suggests_area: "The tag {tag} suggests line should be area, but it is not an area"
-    untagged_tooltip: "Select a feature type that describes what this {geometry} is."
+    untagged_point_tooltip: "Select a feature type that describes what this point is."
+    untagged_line_tooltip: "Select a feature type that describes what this line is."
+    untagged_area_tooltip: "Select a feature type that describes what this area is."
     deprecated_tags: "Deprecated tags: {tags}"
   zoom:
     in: Zoom In
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 0c3f53574..b366fa752 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -336,7 +336,9 @@
         "untagged_area": "Untagged area",
         "many_deletions": "You're deleting {n} objects. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org.",
         "tag_suggests_area": "The tag {tag} suggests line should be area, but it is not an area",
-        "untagged_tooltip": "Select a feature type that describes what this {geometry} is.",
+        "untagged_point_tooltip": "Select a feature type that describes what this point is.",
+        "untagged_line_tooltip": "Select a feature type that describes what this line is.",
+        "untagged_area_tooltip": "Select a feature type that describes what this area is.",
         "deprecated_tags": "Deprecated tags: {tags}"
     },
     "zoom": {
diff --git a/js/id/validate.js b/js/id/validate.js
index 47dda09f5..7315dfad5 100644
--- a/js/id/validate.js
+++ b/js/id/validate.js
@@ -28,7 +28,7 @@ iD.validate = function(changes, graph) {
         if ((geometry === 'point' || geometry === 'line' || geometry === 'area') && !change.isUsed(graph)) {
             warnings.push({
                 message: t('validations.untagged_' + geometry),
-                tooltip: t('validations.untagged_tooltip', {geometry: geometry}),
+                tooltip: t('validations.untagged_' + geometry + '_tooltip'),
                 entity: change
             });
         }