diff --git a/src/coreclr/jit/compiler.cpp b/src/coreclr/jit/compiler.cpp
index 0ae7197967e365..7211aac67a82bf 100644
--- a/src/coreclr/jit/compiler.cpp
+++ b/src/coreclr/jit/compiler.cpp
@@ -5483,8 +5483,8 @@ PhaseStatus Compiler::placeLoopAlignInstructions()
             }
         }
 
-        // If there is an unconditional jump (which isn't to the next block)
-        if (opts.compJitHideAlignBehindJmp && block->KindIs(BBJ_ALWAYS) && !block->HasFlag(BBF_NONE_QUIRK))
+        // If there is an unconditional jump that won't be removed
+        if (opts.compJitHideAlignBehindJmp && block->KindIs(BBJ_ALWAYS) && !block->CanRemoveJumpToNext(this))
         {
             // Track the lower weight blocks
             if (block->bbWeight < minBlockSoFar)
diff --git a/src/coreclr/jit/importer.cpp b/src/coreclr/jit/importer.cpp
index 3e65618ea67ab0..513fa0226d68cb 100644
--- a/src/coreclr/jit/importer.cpp
+++ b/src/coreclr/jit/importer.cpp
@@ -7617,7 +7617,7 @@ void Compiler::impImportBlockCode(BasicBlock* block)
                     else
                     {
                         assert(block->KindIs(BBJ_ALWAYS));
-                        assert(block->HasFlag(BBF_NONE_QUIRK));
+                        assert(block->JumpsToNext());
                     }
 
                     if (op1->gtFlags & GTF_GLOB_EFFECT)