diff --git a/app/src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java b/app/src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java
index 263885e9..c531efeb 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java
@@ -47,7 +47,7 @@ public class DevicesAdapter extends ArrayAdapter<Device> {
         Resources r = getContext().getResources();
 
         Connections.Connection conn = null;
-        if (mConnections != null || mConnections.connections.containsKey(deviceId)) {
+        if (mConnections != null && mConnections.connections.containsKey(deviceId)) {
             conn = mConnections.connections.get(deviceId);
         }