diff --git a/salt/output/highstate.py b/salt/output/highstate.py
index c9b84a1d0e..445fe9f1d2 100644
--- a/salt/output/highstate.py
+++ b/salt/output/highstate.py
@@ -110,13 +110,15 @@ def _format_host(host, data):
             rcounts.setdefault(ret['result'], 0)
             rcounts[ret['result']] += 1
 
-            # Skip this state if it was successfull & diff output was requested
-            if __opts__.get('state_diff', False) and ret['result']:
-                continue
-
             tcolor = colors['GREEN']
             schanged, ctext = _format_changes(ret['changes'])
             nchanges += 1 if schanged else 0
+
+            # Skip this state if it was successfull & diff output was requested
+            if __opts__.get('state_output_diff', False) and \
+               ret['result'] and not schanged:
+                continue
+
             if schanged:
                 tcolor = colors['CYAN']
             if ret['result'] is False: