diff --git a/src/compiler.cc b/src/compiler.cc
index 7f5c5975a8..761c33755e 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -448,7 +448,7 @@ bool ShouldUseIgnition(CompilationInfo* info) {
   // When requesting debug code as a replacement for existing code, we provide
   // the same kind as the existing code (to prevent implicit tier-change).
   if (info->is_debug() && info->shared_info()->is_compiled()) {
-    return info->shared_info()->HasBytecodeArray();
+    return !info->shared_info()->HasBaselineCode();
   }
 
   // Since we can't OSR from Ignition, skip Ignition for asm.js functions.
diff --git a/src/debug/debug.cc b/src/debug/debug.cc
index 6495dce2e2..3173a07f35 100644
--- a/src/debug/debug.cc
+++ b/src/debug/debug.cc
@@ -1325,7 +1325,7 @@ bool Debug::PrepareFunctionForBreakPoints(Handle<SharedFunctionInfo> shared) {
   DCHECK(baseline_exists || suspended_generators.is_empty());
 
   // We do not need to recompile to debug bytecode.
-  if (baseline_exists && !shared->HasDebugCode()) {
+  if (baseline_exists && !shared->code()->has_debug_break_slots()) {
     DCHECK(functions.length() > 0);
     if (!Compiler::CompileDebugCode(functions.first())) return false;
   }