diff --git a/packages/hurumap-core/src/Scope/HeatMapScope.js b/packages/hurumap-core/src/Scope/HeatMapScope.js
index dcf2c379d..b57936a1f 100644
--- a/packages/hurumap-core/src/Scope/HeatMapScope.js
+++ b/packages/hurumap-core/src/Scope/HeatMapScope.js
@@ -125,11 +125,11 @@ export default function HeatMapScope(props) {
                 },
               },
               // TODO: check why tooltip is not working correctly
-              // tooltip: [
-              //   {
-              //     signal: `datum.${primaryGroup} + ' : ' + datum.count`
-              //   }
-              // ]
+              tooltip: [
+                {
+                  signal: `datum.${primaryGroup} + ' : ' + + datatype[Units]`,
+                },
+              ],
             },
             update: {
               y: {