diff --git a/ironicclient/osc/v1/baremetal_node.py b/ironicclient/osc/v1/baremetal_node.py
index 4be739bde..e4cd1d42f 100755
--- a/ironicclient/osc/v1/baremetal_node.py
+++ b/ironicclient/osc/v1/baremetal_node.py
@@ -1113,7 +1113,8 @@ class ShowBaremetalNode(command.ShowOne):
         node.pop("ports", None)
         node.pop('portgroups', None)
 
-        node.setdefault('chassis_uuid', '')
+        if not fields or 'chassis_uuid' in fields:
+            node.setdefault('chassis_uuid', '')
 
         return self.dict2columns(node)
 
diff --git a/ironicclient/tests/unit/osc/v1/test_baremetal_node.py b/ironicclient/tests/unit/osc/v1/test_baremetal_node.py
index 9cdad19e1..55d70eacb 100644
--- a/ironicclient/tests/unit/osc/v1/test_baremetal_node.py
+++ b/ironicclient/tests/unit/osc/v1/test_baremetal_node.py
@@ -2090,7 +2090,8 @@ class TestBaremetalShow(TestBaremetal):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         # DisplayCommandBase.take_action() returns two tuples
-        self.cmd.take_action(parsed_args)
+        columns, data = self.cmd.take_action(parsed_args)
+        self.assertNotIn('chassis_uuid', columns)
 
         # Set expected values
         args = ['xxxxx']
@@ -2113,8 +2114,8 @@ class TestBaremetalShow(TestBaremetal):
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.cmd.take_action(parsed_args)
-
+        columns, data = self.cmd.take_action(parsed_args)
+        self.assertNotIn('chassis_uuid', columns)
         # Set expected values
         args = ['xxxxx']
         fields = ['uuid', 'name', 'extra']