diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/CaseEventListener.java b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/CaseEventListener.java
index 2bacb9234f..048796431d 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/CaseEventListener.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/CaseEventListener.java
@@ -194,7 +194,7 @@ public class CaseEventListener implements PropertyChangeListener {
                  */
                 if ((null == evt.getOldValue()) && (evt.getNewValue() instanceof Case)) {
                     Case curCase = (Case) evt.getNewValue();
-
+                    IngestEventsListener.resetIngestJobCounter();
                     try {
                         // only add default evidence tag if case is open and it doesn't already exist in the tags list.
                         if (Case.isCaseOpen()
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java
index ae450e0a1f..7add3964c1 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java
@@ -86,7 +86,17 @@ public class IngestEventsListener {
      * Repository.
      */
     public synchronized static void disableCentralRepositoryModule() {
-        ingestJobCounter--; //Should be called once in the central repository module's shutdown method.
+        if (isCentralRepositoryModuleEnabled()) {  //prevent it ingestJobCounter from going negative
+            ingestJobCounter--;  //Should be called once in the central repository module's shutdown method.
+        }
+    }
+
+    /**
+     * Reset the counter which keeps track of if the Central Repository Module
+     * is being run during injest to 0.
+     */
+    synchronized static void resetIngestJobCounter() {
+        ingestJobCounter = 0;  //called when a case is opened in case for some reason counter was not reset
     }
 
     /**