diff --git a/package.json b/package.json
index 7b2379f3..83379748 100644
--- a/package.json
+++ b/package.json
@@ -84,22 +84,22 @@
 	"size-limit": [
 		{
 			"brotli": true,
-			"limit": "5.46 KB",
+			"limit": "5.49 KB",
 			"path": "./dist/index.js"
 		},
 		{
 			"gzip": true,
-			"limit": "6.88 KB",
+			"limit": "6.91 KB",
 			"path": "./dist/index.js"
 		},
 		{
 			"brotli": true,
-			"limit": "5.23 KB",
+			"limit": "5.27 KB",
 			"path": "./dist/index.mjs"
 		},
 		{
 			"gzip": true,
-			"limit": "6.64 KB",
+			"limit": "6.67 KB",
 			"path": "./dist/index.mjs"
 		}
 	]
diff --git a/src/conversions/measures/energy.ts b/src/conversions/measures/energy.ts
index 34b1a64a..2fad3e84 100644
--- a/src/conversions/measures/energy.ts
+++ b/src/conversions/measures/energy.ts
@@ -4,13 +4,21 @@ import { type Measure, MeasureKind } from '../types';
 
 export const energy: Measure = {
 	kind: MeasureKind.Energy,
-	best: ['J'],
+	best: ['GWh', 'MWh', 'kWh', 'Wh', 'J'],
 	units: [
 		{ names: ['joule', 'joules'], symbols: ['J'], ratio: 1 },
-		...expandMacro(Macros.si, { names: ['joule', 'joules'], symbols: ['J'], ratio: 1 }),
+		...expandMacro(Macros.si, {
+			names: ['joule', 'joules'],
+			symbols: ['J'],
+			ratio: 1,
+		}),
 
 		// https://en.wikipedia.org/wiki/Kilowatt-hour
 		{ names: ['watt-hour'], symbols: ['W⋅h', 'W h', 'Wh'], ratio: 3600 },
-		...expandMacro(Macros.si, { names: ['watt-hour', 'watt-hours'], symbols: ['W⋅h', 'W h', 'Wh'], ratio: 3600 }),
+		...expandMacro(Macros.si, {
+			names: ['watt-hour', 'watt-hours'],
+			symbols: ['W⋅h', 'W h', 'Wh'],
+			ratio: 3600,
+		}),
 	],
 };