diff --git a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index a0b9f50c0b..9e6d396118 100644
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -41,7 +41,7 @@
             <action class="org.onlab.onos.cli.net.DeviceRoleCommand"/>
             <completers>
                 <ref component-id="deviceIdCompleter"/>
-                <ref component-id="roleCompleter"/>
+                <ref component-id="nodeIdCompleter"/>
                 <ref component-id="roleCompleter"/>
                 <null/>
             </completers>