diff --git a/src/kernel/cstartup.s b/src/kernel/cstartup.s
index 4e68ff4..92ddf24 100755
--- a/src/kernel/cstartup.s
+++ b/src/kernel/cstartup.s
@@ -28,6 +28,9 @@
 __program_root_section:
 	.asciz "WDC"
 w65c265s_init:
+	; Begin tracing for the emulator. NOP for the real hardware.
+	wdm 	  #0x80
+
 	; Disable interrupts
 	sei
 	stz UIER
@@ -70,8 +73,6 @@ delay_y
 	tsb PDD6
 	trb PD6
 
-
-	wdm 	  #0x80
 	clc
 	xce                   ; native 16-bit mode
 	rep     #0x38         ; 16-bit registers, no decimal mode
@@ -128,8 +129,6 @@ __call_heap_initialize:
 	lda     ##.word0 (.sectionSize heap)
 	jsl     long:__heap_initialize
 
-	wdm 	  #0x81
-
 	.section boot, root, noreorder
 	lda     ##0           ; argc = 0
 	jsl     long:main