diff --git a/bec_widgets/widgets/image/image_widget.py b/bec_widgets/widgets/image/image_widget.py
index 5c6f9385..6e08b122 100644
--- a/bec_widgets/widgets/image/image_widget.py
+++ b/bec_widgets/widgets/image/image_widget.py
@@ -457,7 +457,6 @@ class BECImageWidget(BECWidget, QWidget):
 
     def cleanup(self):
         self.fig.cleanup()
-        self.client.shutdown()
         self.toolbar.close()
         self.toolbar.deleteLater()
         return super().cleanup()
diff --git a/bec_widgets/widgets/jupyter_console/jupyter_console.py b/bec_widgets/widgets/jupyter_console/jupyter_console.py
index 68f02134..24234db6 100644
--- a/bec_widgets/widgets/jupyter_console/jupyter_console.py
+++ b/bec_widgets/widgets/jupyter_console/jupyter_console.py
@@ -63,8 +63,6 @@ class BECJupyterConsole(RichJupyterWidget):  # pragma: no cover:
 
     def closeEvent(self, event):
         self.shutdown_kernel()
-        if self.client:
-            self.client.shutdown()
 
 
 if __name__ == "__main__":  # pragma: no cover
diff --git a/bec_widgets/widgets/waveform/waveform_widget.py b/bec_widgets/widgets/waveform/waveform_widget.py
index 4de6405f..e02a6391 100644
--- a/bec_widgets/widgets/waveform/waveform_widget.py
+++ b/bec_widgets/widgets/waveform/waveform_widget.py
@@ -561,7 +561,6 @@ class BECWaveformWidget(BECWidget, QWidget):
 
     def cleanup(self):
         self.fig.cleanup()
-        self.client.shutdown()
         return super().cleanup()