diff --git a/windows/KeyMagic2/KeyMagic2/KeyMagic2.cpp b/windows/KeyMagic2/KeyMagic2/KeyMagic2.cpp
index 17a8cd9..20a00cc 100644
--- a/windows/KeyMagic2/KeyMagic2/KeyMagic2.cpp
+++ b/windows/KeyMagic2/KeyMagic2/KeyMagic2.cpp
@@ -117,7 +117,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 	if (CheckIfRunning()) {
 		return 0;
 	}
-
+#ifdef DEBUG
 	char szPath[MAX_PATH];
 
 	if (SUCCEEDED(SHGetFolderPathA(NULL,
@@ -138,7 +138,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 
 		libkm::KeyMagicLogger::getInstance()->setFile(hFile);
 	}
-
+#endif
     RegisterWindowClass(hInstance);
 
     // Perform application initialization:
diff --git a/windows/KeyMagic2/KeyMagic2/KeyboardManger.cpp b/windows/KeyMagic2/KeyMagic2/KeyboardManger.cpp
index 58581b4..02115a4 100644
--- a/windows/KeyMagic2/KeyMagic2/KeyboardManger.cpp
+++ b/windows/KeyMagic2/KeyMagic2/KeyboardManger.cpp
@@ -55,7 +55,9 @@ libkm::KeyMagicEngine * Keyboard::GetKeyMagicEngine()
 	}
 
 	m_engine = new libkm::KeyMagicEngine();
+#ifdef DEBUG
 	m_engine->m_verbose = true;
+#endif
 	m_engine->loadKeyboardFile(this->KeyboardFullPath().c_str());
 
 	return m_engine;