diff --git a/src/iperf_api.c b/src/iperf_api.c
index fb4273f1e..2f826eaa3 100644
--- a/src/iperf_api.c
+++ b/src/iperf_api.c
@@ -4628,8 +4628,12 @@ iperf_reporter_callback(struct iperf_test *test)
             iperf_print_intermediate(test);
             break;
         case TEST_END:
-        case DISPLAY_RESULTS:
             iperf_print_intermediate(test);
+            if (test->role == 's') {
+                iperf_print_results(test);
+            }
+            break;
+        case DISPLAY_RESULTS:
             iperf_print_results(test);
             break;
     }
diff --git a/src/iperf_client_api.c b/src/iperf_client_api.c
index 165193ba6..daa893861 100644
--- a/src/iperf_client_api.c
+++ b/src/iperf_client_api.c
@@ -810,6 +810,7 @@ iperf_run_client(struct iperf_test * test)
 		test->stats_callback(test);
 		if (iperf_set_send_state(test, TEST_END) != 0)
                     goto cleanup_and_fail;
+                test->reporter_callback(test);
 	    }
 	}
     }