diff --git a/mm/compaction.c b/mm/compaction.c
index 91a9dfa41ef4..fe7b4e7c5d24 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -1442,7 +1442,7 @@ fast_isolate_around(struct compact_control *cc, unsigned long pfn)
 	isolate_freepages_block(cc, &start_pfn, end_pfn, &cc->freepages, 1, false);
 
 	/* Skip this pageblock in the future as it's full or nearly full */
-	if (start_pfn == end_pfn)
+	if (start_pfn == end_pfn && !cc->no_set_skip_hint)
 		set_pageblock_skip(page);
 }