diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43c700f..8ecfdc6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 
 - Add default Color Mode Id for older releases (7.2.X) #49
 - Fix Latency below zero calculation #56
+- "Cannot read property 'Tooltip' of undefined" for Latency Panel in the upcoming release #60
 
 ## v1.1.0 (2021-02-07)
 
diff --git a/src/redis-gears-panel/components/code-editor/code-editor.test.tsx b/src/redis-gears-panel/components/code-editor/code-editor.test.tsx
index 47dda4b..707cd92 100644
--- a/src/redis-gears-panel/components/code-editor/code-editor.test.tsx
+++ b/src/redis-gears-panel/components/code-editor/code-editor.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
 import { shallow } from 'enzyme';
+import React from 'react';
 import Editor from '@monaco-editor/react';
 import { UnthemedCodeEditor } from './code-editor';
 
diff --git a/src/redis-latency-panel/components/redis-latency-panel-graph/redis-latency-panel-graph.tsx b/src/redis-latency-panel/components/redis-latency-panel-graph/redis-latency-panel-graph.tsx
index d04e455..5c2f8c7 100644
--- a/src/redis-latency-panel/components/redis-latency-panel-graph/redis-latency-panel-graph.tsx
+++ b/src/redis-latency-panel/components/redis-latency-panel-graph/redis-latency-panel-graph.tsx
@@ -210,7 +210,7 @@ export class RedisLatencyPanelGraph extends PureComponent<Props, State> {
         hideZero={options?.hideZero}
         showLines
       >
-        <Chart.Tooltip mode="multi"></Chart.Tooltip>
+        {Chart && <Chart.Tooltip mode="multi"></Chart.Tooltip>}
       </GraphWithLegend>
     );
   }