diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5db0409382..e89fcfa027 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 ## Wazuh v4.3.5 - OpenSearch Dashboards 1.2.0 - Revision 4306
 
+### Fixed
+
+- Fixed type error when changing screen size in agents section [#4233](https://github.com/wazuh/wazuh-kibana-app/pull/4233)
+- Fixed an error when generating a module report after changing the selected agent [#4240](https://github.com/wazuh/wazuh-kibana-app/pull/4240)
+
 ### Changed
 
 - Changed the word Manager to Wazuh server from the phrases that appeared in "Deploy a new agent". [#4239](https://github.com/wazuh/wazuh-kibana-app/pull/4239)
diff --git a/public/kibana-integrations/kibana-vis.js b/public/kibana-integrations/kibana-vis.js
index 7bc49a1230..27e2adc156 100644
--- a/public/kibana-integrations/kibana-vis.js
+++ b/public/kibana-integrations/kibana-vis.js
@@ -109,7 +109,17 @@ class KibanaVis extends Component {
   componentWillUnmount() {
     if (this._isMounted) {
       this._isMounted = false;
-      this.updateVis();
+      // It would be good to continue investigating if it is
+      // necessary for the renderComplete() to be in the
+      // componentWillUnmount.
+      // In the renderComplete() the value of the $rootScope
+      // is changed, which affects the entire application.
+      // 
+      // Related issue:
+      // https://github.com/wazuh/wazuh-kibana-app/issues/4158
+      if (this.deadField) {
+        return this.renderComplete();
+      }
       this.destroyAll();
     }
   }