diff --git a/src/compiler/Frontend.cc b/src/compiler/Frontend.cc
index 71435eb..6ccccd2 100644
--- a/src/compiler/Frontend.cc
+++ b/src/compiler/Frontend.cc
@@ -795,6 +795,7 @@
             (1 << kLoadHoisting) |
             (1 << kSuppressLoads) |
             (1 << kPromoteRegs) |
+            (1 << kBBOpt) |
             (1 << kTrackLiveTemps));
     }
 
@@ -947,6 +948,7 @@
             // Disable optimization which require dataflow/ssa
             cUnit->disableOpt |=
                 (1 << kNullCheckElimination) |
+                (1 << kBBOpt) |
                 (1 << kPromoteRegs);
             if (cUnit->printMe) {
                 LOG(INFO) << "Compiler: " << PrettyMethod(method_idx, dex_file)