diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Installer.java b/Core/src/org/sleuthkit/autopsy/casemodule/Installer.java
new file mode 100644
index 0000000000..c3fd221f2b
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Installer.java
@@ -0,0 +1,60 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2020 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.casemodule;
+
+import java.io.File;
+import java.util.logging.Level;
+import org.apache.commons.io.FileUtils;
+import org.openide.modules.ModuleInstall;
+import org.sleuthkit.autopsy.casemodule.settings.CaseSettingsUtil;
+import org.sleuthkit.autopsy.coreutils.Logger;
+
+/**
+ * Installer for casemodule that cleans out user specified temp directory.
+ */
+public class Installer extends ModuleInstall {
+
+    private static final Logger logger = Logger.getLogger(Installer.class.getName());
+    private static final long serialVersionUID = 1L;
+
+    private static Installer instance;
+
+    public synchronized static Installer getDefault() {
+        if (instance == null) {
+            instance = new Installer();
+        }
+        return instance;
+    }
+
+    private Installer() {
+    }
+
+    @Override
+    public void restored() {
+        String tempDir = null;
+        try {
+            if (CaseSettingsUtil.isBaseTempDirectorySpecified()) {
+                tempDir = CaseSettingsUtil.getBaseTempDirectory();
+                FileUtils.cleanDirectory(new File(tempDir));
+            }   
+        } catch (Exception ex) {
+            logger.log(Level.WARNING, "There was an error while cleaning up temp directory: " + (tempDir == null ? "<null>" : tempDir), ex);
+        }
+    }
+}
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/settings/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/casemodule/settings/Bundle.properties-MERGED
new file mode 100644
index 0000000000..2f0f38d174
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/settings/Bundle.properties-MERGED
@@ -0,0 +1,4 @@
+# {0} - path
+UserPreferences_setBaseTempDirectory_errorOnCreate_text=There was an error creating the temp directory for path: {0}
+# {0} - path
+UserPreferences_setBaseTempDirectory_errorOnReadWrite_text=There was an error reading or writing to temp directory path: {0}