diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java
index f9dba08034..0fa7f156ee 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java
@@ -1243,9 +1243,9 @@ public class SharedConfiguration {
             HashDbManager hashDbManager = HashDbManager.getInstance();
             hashDbManager.loadLastSavedConfiguration();
             for (HashDbManager.HashDb hashDb : hashDbManager.getAllHashSets()) {
-                if (hashDb.hasIndexOnly()) {
+                if (hashDb.hasIndexOnly() && (!hashDb.getIndexPath().isEmpty())) {
                     results.add(hashDb.getIndexPath());
-                } else {
+                } else if (!hashDb.getDatabasePath().isEmpty()) {
                     results.add(hashDb.getDatabasePath());
                 }
             }