diff --git a/logic/nodes.go b/logic/nodes.go
index 5b81c9b8..abc2f4ac 100644
--- a/logic/nodes.go
+++ b/logic/nodes.go
@@ -792,10 +792,13 @@ func AddStaticNodesWithTag(tag models.Tag, nMap map[string]models.Node) map[stri
 		if extclient.RemoteAccessClientID != "" {
 			continue
 		}
-		nMap[extclient.ClientID] = models.Node{
-			IsStatic:   true,
-			StaticNode: extclient,
+		if _, ok := extclient.Tags[tag.ID]; ok {
+			nMap[extclient.ClientID] = models.Node{
+				IsStatic:   true,
+				StaticNode: extclient,
+			}
 		}
+
 	}
 	return nMap
 }