diff --git a/src/panel-triggers/triggers_tab.js b/src/panel-triggers/triggers_tab.js
index 668f2d1..db230a0 100644
--- a/src/panel-triggers/triggers_tab.js
+++ b/src/panel-triggers/triggers_tab.js
@@ -83,6 +83,12 @@ class TriggersTabCtrl {
         this.panel.targets[ds] = getDefaultTarget();
       }
     });
+    // Remove unchecked targets
+    _.each(this.panel.targets, (target, ds) => {
+      if (!_.includes(this.panel.datasources, ds)) {
+        delete this.panel.targets[ds];
+      }
+    });
     this.parseTarget();
   }