diff --git a/Core/src/org/sleuthkit/autopsy/modules/yara/ui/YaraRuleSetOptionPanel.java b/Core/src/org/sleuthkit/autopsy/modules/yara/ui/YaraRuleSetOptionPanel.java
index 65ad3c6772..cd5beb0009 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/yara/ui/YaraRuleSetOptionPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/yara/ui/YaraRuleSetOptionPanel.java
@@ -90,13 +90,14 @@ public class YaraRuleSetOptionPanel extends javax.swing.JPanel {
 
         if(ruleSet != null && !ruleSet.getPath().toFile().exists()) {
             ruleSetDetailsPanel.setRuleSet(null);
+            ruleSetPanel.removeRuleSet(ruleSet);
             JOptionPane.showMessageDialog(this,
                     Bundle.YaraRuleSetOptionPanel_RuleSet_Missing(ruleSet.getName()),
                     Bundle.YaraRuleSetOptionPanel_RuleSet_Missing_title(),
                     JOptionPane.ERROR_MESSAGE);
-        } 
-        
-        ruleSetDetailsPanel.setRuleSet(ruleSet);
+        } else {
+            ruleSetDetailsPanel.setRuleSet(ruleSet);
+        }
     }
 
     @Messages({