diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb
index c655627..cfb74d6 100644
--- a/Global_Indexer/frmIndex.vb
+++ b/Global_Indexer/frmIndex.vb
@@ -2705,8 +2705,6 @@ Public Class frmIndex
         ClearError()
         ClearNotice()
 
-
-
         Me.Cursor = Cursors.WaitCursor
         ClassHelper.Refresh_RegexTable()
         For Each rowregex As DataRow In CURRENT_DT_REGEX.Rows
@@ -2767,11 +2765,24 @@ Public Class frmIndex
             End If
         End If
 
-
+        ' Clear all temp files after indexing
+        Clear_Tempfiles()
         EMAIL.Clear_TempFiles()
+
         Me.Cursor = Cursors.Default
     End Sub
 
+    Private Sub Clear_Tempfiles()
+        'TempDateien löschen
+        For Each oFile In TEMP_FILES
+            Try
+                System.IO.File.Delete(oFile)
+            Catch ex As Exception
+                LOGGER.Error(ex)
+            End Try
+        Next
+    End Sub
+
     Private Sub checkItemPreview_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles checkItemPreview.CheckedChanged
         SetFilePreview(checkItemPreview.Checked)
         CONFIG.Config.FilePreview = checkItemPreview.Checked