diff --git a/setup.py b/setup.py
index b9a780aa48..09d5db8710 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="home-assistant-frontend",
-    version="20210803.2",
+    version="20210804.0",
     description="The Home Assistant frontend",
     url="https://github.com/home-assistant/frontend",
     author="The Home Assistant Authors",
diff --git a/src/data/energy.ts b/src/data/energy.ts
index 40a0249959..a35dded6d1 100644
--- a/src/data/energy.ts
+++ b/src/data/energy.ts
@@ -12,7 +12,7 @@ import { ConfigEntry, getConfigEntries } from "./config_entries";
 import { subscribeEntityRegistry } from "./entity_registry";
 import { fetchStatistics, Statistics } from "./history";
 
-const energyCollectionKeys: string[] = [];
+const energyCollectionKeys: (string | undefined)[] = [];
 
 export const emptyFlowFromGridSourceEnergyPreference =
   (): FlowFromGridSourceEnergyPreference => ({
@@ -278,7 +278,7 @@ export const getEnergyDataCollection = (
     return (hass.connection as any)[key];
   }
 
-  energyCollectionKeys.push(options.key || "energy");
+  energyCollectionKeys.push(options.key);
 
   const collection = getCollection<EnergyData>(
     hass.connection,
diff --git a/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts b/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts
index 2752e867dc..bd8e13afce 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts
@@ -126,8 +126,10 @@ class HuiEnergyCarbonGaugeCard
       <ha-card>
         <ha-svg-icon id="info" .path=${mdiInformation}></ha-svg-icon>
         <paper-tooltip animation-delay="0" for="info" position="left">
-          This card represents how much of the energy consumed by your home was
-          generated using non-fossil fuels like solar, wind and nuclear.
+          <span>
+            This card represents how much of the energy consumed by your home
+            was generated using non-fossil fuels like solar, wind and nuclear.
+          </span>
         </paper-tooltip>
 
         ${value !== undefined
@@ -194,10 +196,14 @@ class HuiEnergyCarbonGaugeCard
         top: 4px;
         color: var(--secondary-text-color);
       }
+      paper-tooltip > span {
+        font-size: 12px;
+        line-height: 12px;
+      }
       paper-tooltip {
         width: 80%;
         max-width: 250px;
-        margin-top: 10%;
+        top: 8px !important;
       }
     `;
   }
diff --git a/src/panels/lovelace/cards/energy/hui-energy-grid-neutrality-gauge-card.ts b/src/panels/lovelace/cards/energy/hui-energy-grid-neutrality-gauge-card.ts
index 00609e178b..6266313366 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-grid-neutrality-gauge-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-grid-neutrality-gauge-card.ts
@@ -98,11 +98,13 @@ class HuiEnergyGridGaugeCard
       <ha-card>
         <ha-svg-icon id="info" .path=${mdiInformation}></ha-svg-icon>
         <paper-tooltip animation-delay="0" for="info" position="left">
-          This card represents your energy dependency.
-          <br /><br />
-          If it's green, it means you produced more energy than that you
-          consumed from the grid. If it's in the red, it means that you relied
-          on the grid for part of your home's energy consumption.
+          <span>
+            This card represents your energy dependency.
+            <br /><br />
+            If it's green, it means you produced more energy than that you
+            consumed from the grid. If it's in the red, it means that you relied
+            on the grid for part of your home's energy consumption.
+          </span>
         </paper-tooltip>
         ${value !== undefined
           ? html`<ha-gauge
@@ -162,10 +164,14 @@ class HuiEnergyGridGaugeCard
         top: 4px;
         color: var(--secondary-text-color);
       }
+      paper-tooltip > span {
+        font-size: 12px;
+        line-height: 12px;
+      }
       paper-tooltip {
         width: 80%;
         max-width: 250px;
-        margin-top: 10%;
+        top: 8px !important;
       }
     `;
   }
diff --git a/src/panels/lovelace/cards/energy/hui-energy-solar-consumed-gauge-card.ts b/src/panels/lovelace/cards/energy/hui-energy-solar-consumed-gauge-card.ts
index dbb537aad3..1a0cbaed2b 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-solar-consumed-gauge-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-solar-consumed-gauge-card.ts
@@ -88,11 +88,14 @@ class HuiEnergySolarGaugeCard
       <ha-card>
         <ha-svg-icon id="info" .path=${mdiInformation}></ha-svg-icon>
         <paper-tooltip animation-delay="0" for="info" position="left">
-          This card represents how much of the solar energy was used by your
-          home and was not returned to the grid.
-          <br /><br />
-          If you frequently produce more than you consume, try to conserve this
-          energy by installing a battery or buying an electric car to charge.
+          <span>
+            This card represents how much of the solar energy was used by your
+            home and was not returned to the grid.
+            <br /><br />
+            If you frequently produce more than you consume, try to conserve
+            this energy by installing a battery or buying an electric car to
+            charge.
+          </span>
         </paper-tooltip>
         ${value !== undefined
           ? html`<ha-gauge
@@ -157,10 +160,14 @@ class HuiEnergySolarGaugeCard
         top: 4px;
         color: var(--secondary-text-color);
       }
+      paper-tooltip > span {
+        font-size: 12px;
+        line-height: 12px;
+      }
       paper-tooltip {
         width: 80%;
         max-width: 250px;
-        margin-top: 10%;
+        top: 8px !important;
       }
     `;
   }
diff --git a/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts
index 875845f103..f0f68158f6 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts
@@ -101,7 +101,7 @@ export class HuiEnergySolarGraphCard
             ? html`<div class="no-data">
                 ${isToday(this._start)
                   ? "There is no data to show. It can take up to 2 hours for new data to arrive after you configure your energy dashboard."
-                  : "There is not data for this period."}
+                  : "There is no data for this period."}
               </div>`
             : ""}
         </div>
diff --git a/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts
index 7452d36d2d..8f0fe2e6dd 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts
@@ -88,7 +88,7 @@ export class HuiEnergyUsageGraphCard
             ? html`<div class="no-data">
                 ${isToday(this._start)
                   ? "There is no data to show. It can take up to 2 hours for new data to arrive after you configure your energy dashboard."
-                  : "There is not data for this period."}
+                  : "There is no data for this period."}
               </div>`
             : ""}
         </div>