diff --git a/resource/web/event_config.tmpl b/resource/web/event_config.tmpl
index e06a222e..d9b267b1 100755
--- a/resource/web/event_config.tmpl
+++ b/resource/web/event_config.tmpl
@@ -59,6 +59,13 @@
                 <th>Date</th>
                 <th>Data</th>
                 <th>Configuration</th>
+                <th>
+                    <form method="POST">
+                        <button type="submit" class="btn btn-danger btn-xs pull-right" name="action" value="remove_all_detected_events">
+                            <span class="glyphicon glyphicon-trash"></span>
+                        </button>
+                    </form>
+                </th>
                 </thead>
                 {{#detectedEvents}}
                 <tr>
diff --git a/resource/web/sensor_config.tmpl b/resource/web/sensor_config.tmpl
index e5c951bc..e4dd0a49 100755
--- a/resource/web/sensor_config.tmpl
+++ b/resource/web/sensor_config.tmpl
@@ -61,6 +61,7 @@
                 <th>Type</th>
                 <th>Date</th>
                 <th>Data</th>
+                <th>Configuration</th>
                 <th>
                     <form method="POST">
                         <button type="submit" class="btn btn-danger btn-xs pull-right" name="action" value="remove_all_detected_sensors">
diff --git a/src/se/hal/ControllerManager.java b/src/se/hal/ControllerManager.java
index dc0e0e17..ca176210 100755
--- a/src/se/hal/ControllerManager.java
+++ b/src/se/hal/ControllerManager.java
@@ -265,6 +265,13 @@ public class ControllerManager implements HalSensorReportListener,
         return detectedEvents;
     }
 
+    /**
+     * Removes all auto detected events.
+     */
+    public void clearDetectedEvents(){
+        detectedEvents.clear();
+    }
+
     /**
      * Called by Controllers to report received Event data
      */
diff --git a/src/se/hal/page/EventConfigHttpPage.java b/src/se/hal/page/EventConfigHttpPage.java
index 3fb1658c..56a34582 100755
--- a/src/se/hal/page/EventConfigHttpPage.java
+++ b/src/se/hal/page/EventConfigHttpPage.java
@@ -85,6 +85,10 @@ public class EventConfigHttpPage extends HalHttpPage {
                                 AlertLevel.ERROR, "Unknown event id: "+id, AlertTTL.ONE_VIEW));
                     }
                     break;
+
+                case "remove_all_detected_events":
+                    ControllerManager.getInstance().clearDetectedEvents();
+                    break;
             }
         }