diff --git a/src/main/java/mediathek/Main.java b/src/main/java/mediathek/Main.java
index 944c700c4..bbe5bfb11 100644
--- a/src/main/java/mediathek/Main.java
+++ b/src/main/java/mediathek/Main.java
@@ -505,11 +505,31 @@ public static void main(final String... args) {
                     .getBoolean(ApplicationConfiguration.APPLICATION_USE_MODERN_SEARCH, false);
             if (useModernSearch)
                 Daten.getInstance().setListeFilmeNachBlackList(new IndexedFilmList());
+            else {
+                try {
+                    checkModernSearchIndexRemoval();
+                } catch (IOException e) {
+                    logger.error("Unable to delete lucene index path", e);
+                }
+            }
 
             startGuiMode();
         });
     }
 
+    /**
+     * Remove modern search index when not in use.
+     * @throws IOException
+     */
+    private static void checkModernSearchIndexRemoval() throws IOException {
+        //when modern search is not in use, delete unused film index directory as a precaution
+        var indexPath = StandardLocations.getFilmIndexPath();
+        if (Files.exists(indexPath)) {
+            logger.info("Modern search not in use, deleting unnecessary index directory");
+            FileUtils.deletePathRecursively(indexPath);
+        }
+    }
+
     /**
      * Checks if the application has an debugger attached to it.
      *