diff --git a/tomviz/DataSource.cxx b/tomviz/DataSource.cxx
index e155d454e..85a5ada17 100644
--- a/tomviz/DataSource.cxx
+++ b/tomviz/DataSource.cxx
@@ -168,6 +168,7 @@ DataSource::DataSource(const QString& label, DataSourceType dataType,
 
 DataSource::~DataSource()
 {
+  ModuleManager::instance().removeAllModules(this);
   if (this->Internals->ProducerProxy) {
     vtkNew<vtkSMParaViewPipelineController> controller;
     controller->UnRegisterProxy(this->Internals->ProducerProxy);