diff --git a/packages/grafana-data/src/valueFormats/valueFormats.test.ts b/packages/grafana-data/src/valueFormats/valueFormats.test.ts
index 1592136660f..dea42d07076 100644
--- a/packages/grafana-data/src/valueFormats/valueFormats.test.ts
+++ b/packages/grafana-data/src/valueFormats/valueFormats.test.ts
@@ -123,4 +123,12 @@ describe('valueFormats', () => {
       expect(str).toBe('186');
     });
   });
+
+  describe('Resolve old units', () => {
+    it('resolve farenheit', () => {
+      const fmt0 = getValueFormat('farenheit');
+      const fmt1 = getValueFormat('fahrenheit');
+      expect(fmt0).toEqual(fmt1);
+    });
+  });
 });
diff --git a/packages/grafana-data/src/valueFormats/valueFormats.ts b/packages/grafana-data/src/valueFormats/valueFormats.ts
index 88d34221aac..176e3a997dc 100644
--- a/packages/grafana-data/src/valueFormats/valueFormats.ts
+++ b/packages/grafana-data/src/valueFormats/valueFormats.ts
@@ -164,6 +164,14 @@ function buildFormats() {
     }
   }
 
+  // Resolve units pointing to old IDs
+  [{ from: 'farenheit', to: 'fahrenheit' }].forEach(alias => {
+    const f = index[alias.to];
+    if (f) {
+      index[alias.from] = f;
+    }
+  });
+
   hasBuiltIndex = true;
 }