diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
index 9d9cb0dd11..0d5082e1b9 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
@@ -306,7 +306,6 @@ public class Case {
                     eventPublisher.openRemoteEventChannel(String.format(EVENT_CHANNEL_NAME, newCase.getTextIndexName()));
                     currentCase.collaborationMonitor = new CollaborationMonitor();
                 } catch (AutopsyEventException | CollaborationMonitor.CollaborationMonitorException ex) {
-                    currentCase.collaborationMonitor.shutdown();
                     logger.log(Level.SEVERE, "Failed to setup for collaboration", ex);
                     MessageNotifyUtil.Notify.error(NbBundle.getMessage(Case.class, "Case.CollaborationSetup.FailNotify.Title"), NbBundle.getMessage(Case.class, "Case.CollaborationSetup.FailNotify.ErrMsg"));
                 }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CollaborationMonitor.java b/Core/src/org/sleuthkit/autopsy/casemodule/CollaborationMonitor.java
index ba09716a92..5626942e83 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CollaborationMonitor.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CollaborationMonitor.java
@@ -173,7 +173,7 @@ final class CollaborationMonitor {
         }
 
         Case.removeEventSubscriber(CASE_EVENTS_OF_INTEREST, localTasksManager);
-        eventPublisher.removeSubscriber(COLLABORATION_MONITOR_EVENT, remoteTasksManager);
+        IngestManager.getInstance().removeIngestJobEventListener(localTasksManager);
 
         if (null != eventPublisher) {
             eventPublisher.removeSubscriber(COLLABORATION_MONITOR_EVENT, remoteTasksManager);