diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 9d1ae8e5d2..039c0ae34e 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -241,7 +241,8 @@
         <if cond="DEBUG_INFO=='0'">off</if>
     </set>
     <set var="DEBUGRUNTIME">
-        <if cond="DEBUG_RUNTIME_LIBS=='default'">$(DEBUGINFO)</if>
+        <if cond="DEBUG_RUNTIME_LIBS=='default' and BUILD=='debug'">on</if>
+        <if cond="DEBUG_RUNTIME_LIBS=='default' and BUILD=='release'">off</if>
         <if cond="DEBUG_RUNTIME_LIBS=='0'">off</if>
         <if cond="DEBUG_RUNTIME_LIBS=='1'">on</if>
     </set>