diff --git a/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx b/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx
index 975b574f6f4..6080ffc9e5f 100644
--- a/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx
+++ b/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx
@@ -22,6 +22,15 @@ export const getFieldValidationMessageStyles = stylesFactory((theme: GrafanaThem
       border-radius: ${theme.shape.borderRadius()};
       position: relative;
       display: inline-block;
+
+      a {
+        color: ${theme.colors.error.contrastText};
+        text-decoration: underline;
+      }
+
+      a:hover {
+        text-decoration: none;
+      }
     `;
 
   return {
diff --git a/packages/grafana-ui/src/components/Tooltip/Tooltip.tsx b/packages/grafana-ui/src/components/Tooltip/Tooltip.tsx
index a0cd2ef0551..7ad6aa2a626 100644
--- a/packages/grafana-ui/src/components/Tooltip/Tooltip.tsx
+++ b/packages/grafana-ui/src/components/Tooltip/Tooltip.tsx
@@ -187,11 +187,12 @@ function getStyles(theme: GrafanaTheme2) {
       }
 
       a {
-        color: ${theme.colors.text.link};
+        color: ${tooltipText};
+        text-decoration: underline;
       }
 
       a:hover {
-        text-decoration: underline;
+        text-decoration: none;
       }
     `;
   }