diff --git a/app/src/processing/app/AbstractMonitor.java b/app/src/processing/app/AbstractMonitor.java
index 4fb819a73..9519d1803 100644
--- a/app/src/processing/app/AbstractMonitor.java
+++ b/app/src/processing/app/AbstractMonitor.java
@@ -80,7 +80,7 @@ public abstract class AbstractMonitor extends JFrame implements ActionListener {
       @Override
       public void actionPerformed(ActionEvent ae) {
         try {
-          if (!Base.getDiscoveryManager().discovery().contains(boardPort)) {
+          if (Base.getDiscoveryManager().find(boardPort.getAddress()) == null) {
             if (!closed) {
               suspend();
             }