diff --git a/glances/outputs/static/html/plugins/per_cpu.html b/glances/outputs/static/html/plugins/per_cpu.html
index 0def3a1b..552fc017 100644
--- a/glances/outputs/static/html/plugins/per_cpu.html
+++ b/glances/outputs/static/html/plugins/per_cpu.html
@@ -19,13 +19,13 @@
         <div class="table-cell text-left">idle:</div>
         <div class="table-cell" ng-repeat="percpu in statsPerCpu.cpus">{{ percpu.idle }}%</div>
     </div>
-    <div class="table-row">
+    <div class="table-row" ng-show="statsPerCpu.cpus[0].iowait">
         <div class="table-cell text-left">iowait:</div>
         <div class="table-cell" ng-repeat="percpu in statsPerCpu.cpus" ng-class="statsPerCpu.getSystemAlert(percpu)">
             {{ percpu.iowait }}%
         </div>
     </div>
-    <div class="table-row">
+    <div class="table-row" ng-show="statsPerCpu.cpus[0].steal">
         <div class="table-cell text-left">steal:</div>
         <div class="table-cell" ng-repeat="percpu in statsPerCpu.cpus" ng-class="statsPerCpu.getSystemAlert(percpu)">
             {{ percpu.steal }}%
diff --git a/glances/plugins/glances_percpu.py b/glances/plugins/glances_percpu.py
index 0d70b3b6..20857673 100644
--- a/glances/plugins/glances_percpu.py
+++ b/glances/plugins/glances_percpu.py
@@ -95,6 +95,9 @@ class Plugin(GlancesPlugin):
 
         # Stats per-CPU
         for stat in ['user', 'system', 'idle', 'iowait', 'steal']:
+            if not stat in self.stats[0]:
+                continue
+
             ret.append(self.curse_new_line())
             msg = '{0:8}'.format(stat + ':')
             ret.append(self.curse_add_line(msg))