diff --git a/op-mode-definitions/show-console-server.xml.in b/op-mode-definitions/show-console-server.xml.in
index eae6fd5364..03dd97d83e 100644
--- a/op-mode-definitions/show-console-server.xml.in
+++ b/op-mode-definitions/show-console-server.xml.in
@@ -21,13 +21,13 @@
             <properties>
               <help>Examine console ports and configured baud rates</help>
             </properties>
-            <command>/usr/bin/console -x</command>
+            <command>if cli-shell-api existsActive service console-server; then /usr/bin/console -x; else echo "Console server is not configured"; fi</command>
           </leafNode>
           <leafNode name="user">
             <properties>
               <help>Show users on various consoles</help>
             </properties>
-            <command>/usr/bin/console -u</command>
+            <command>if cli-shell-api existsActive service console-server; then /usr/bin/console -u; else echo "Console server is not configured"; fi</command>
           </leafNode>
         </children>
       </node>