diff --git a/Intel8080/test/Board.cpp b/Intel8080/test/Board.cpp
index 0921c76..ff81f8f 100644
--- a/Intel8080/test/Board.cpp
+++ b/Intel8080/test/Board.cpp
@@ -42,7 +42,9 @@ void Board::Cpu_ExecutingInstruction_Cpm(const EightBit::Intel8080&) {
 	switch (pc.word) {
 	case 0x0:	// CP/M warm start
 		m_cpu.halt();
-		m_profiler.dump();
+		if (m_configuration.isProfileMode()) {
+			m_profiler.dump();
+		}
 		break;
 	case 0x5:	// BDOS
 		bdos();
diff --git a/Z80/test/Board.cpp b/Z80/test/Board.cpp
index a6843e0..c3d4984 100644
--- a/Z80/test/Board.cpp
+++ b/Z80/test/Board.cpp
@@ -41,7 +41,9 @@ void Board::Cpu_ExecutingInstruction_Cpm(const EightBit::Z80&) {
 	switch (pc.word) {
 	case 0x0:	// CP/M warm start
 		m_cpu.halt();
-		m_profiler.dump();
+		if (m_configuration.isProfileMode()) {
+			m_profiler.dump();
+		}
 		break;
 	case 0x5:	// BDOS
 		bdos();