diff --git a/src/components/dialogs/DialogAssociation.vue b/src/components/dialogs/DialogAssociation.vue
index c514a577573..b8d5393922c 100644
--- a/src/components/dialogs/DialogAssociation.vue
+++ b/src/components/dialogs/DialogAssociation.vue
@@ -119,11 +119,12 @@
 
 <script>
 import { Protocols } from '@zwave-js/core/safe'
+import { mapState } from 'pinia'
+import useBaseStore from '../../stores/base.js'
 
 export default {
 	props: {
 		value: Boolean,
-		nodes: Array,
 		associations: Array,
 		node: Object,
 	},
@@ -134,12 +135,15 @@ export default {
 		},
 	},
 	computed: {
+		...mapState(useBaseStore, ['controllerNode', 'nodes']),
 		filteredNodes() {
-			return this.nodes.filter(
-				(n) =>
-					n.id !== this.node.id &&
-					n.protocol !== Protocols.ZWaveLongRange,
-			)
+			return this.node.protocol === Protocols.ZWaveLongRange
+				? [this.controllerNode]
+				: this.nodes.filter(
+						(n) =>
+							n.id !== this.node.id &&
+							n.protocol !== Protocols.ZWaveLongRange,
+				  )
 		},
 		endpoints() {
 			return this.getEndpointItems(this.node)
diff --git a/src/components/nodes-table/AssociationGroups.vue b/src/components/nodes-table/AssociationGroups.vue
index f64d944bc68..3089d38ab16 100644
--- a/src/components/nodes-table/AssociationGroups.vue
+++ b/src/components/nodes-table/AssociationGroups.vue
@@ -68,7 +68,6 @@
 			@add="addAssociation"
 			@close="dialogAssociation = false"
 			v-model="dialogAssociation"
-			:nodes="nodes"
 			:node="node"
 			:associations="associations"
 		/>