diff --git a/desmume/src/NDSSystem.h b/desmume/src/NDSSystem.h
index 94d82a778..29fcf5b61 100644
--- a/desmume/src/NDSSystem.h
+++ b/desmume/src/NDSSystem.h
@@ -526,7 +526,9 @@ extern struct TCommonSettings {
 			for(int x=0;x<5;x++)
 				dispLayers[g][x]=true;
 #ifdef HAVE_JIT
-		use_jit = true;
+		//zero 06-sep-2012 - shouldnt be defaulting this to true for now, since the jit is buggy. 
+		//id rather have people discover a bonus speedhack than discover new bugs in a new version
+		use_jit = false;
 #else
 		use_jit = false;
 #endif
diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index f4994a0ca..69d352b63 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -2966,7 +2966,9 @@ int _main()
 	GetPrivateProfileString("Firmware", "FirmwareFile", "firmware.bin", CommonSettings.Firmware, 256, IniName);
 	CommonSettings.BootFromFirmware = GetPrivateProfileBool("Firmware", "BootFromFirmware", false, IniName);
 
-	CommonSettings.use_jit = GetPrivateProfileBool("Emulation", "CPUmode", true, IniName);
+	//zero 06-sep-2012 - shouldnt be defaulting this to true for now, since the jit is buggy. 
+	//id rather have people discover a bonus speedhack than discover new bugs in a new version
+	CommonSettings.use_jit = GetPrivateProfileBool("Emulation", "CPUmode", false, IniName);
 
   video.setfilter(GetPrivateProfileInt("Video", "Filter", video.NONE, IniName));
 	FilterUpdate(MainWindow->getHWnd(),false);