diff --git a/clippy_lints/src/unnecessary_semicolon.rs b/clippy_lints/src/unnecessary_semicolon.rs
index 76e24b6bf805..e1e450a52fdf 100644
--- a/clippy_lints/src/unnecessary_semicolon.rs
+++ b/clippy_lints/src/unnecessary_semicolon.rs
@@ -88,7 +88,8 @@ impl<'tcx> LateLintPass<'tcx> for UnnecessarySemicolon {
             )
             && cx.typeck_results().expr_ty(expr).is_unit()
             // if a stmt has attrs, then turning it into an expr will break the code, since attrs aren't allowed on exprs
-            && cx.tcx.hir_attrs(stmt.hir_id).is_empty()
+            // -- unless the corresponding feature is enabled
+            && (cx.tcx.hir_attrs(stmt.hir_id).is_empty() || cx.tcx.features().stmt_expr_attributes())
         {
             if let Some(block_is_unit) = self.is_last_in_block(stmt) {
                 if cx.tcx.sess.edition() <= Edition2021 && leaks_droppable_temporary_with_limited_lifetime(cx, expr) {
diff --git a/tests/ui/unnecessary_semicolon_feature_stmt_expr_attributes.fixed b/tests/ui/unnecessary_semicolon_feature_stmt_expr_attributes.fixed
new file mode 100644
index 000000000000..ed36a34f2b88
--- /dev/null
+++ b/tests/ui/unnecessary_semicolon_feature_stmt_expr_attributes.fixed
@@ -0,0 +1,13 @@
+#![warn(clippy::unnecessary_semicolon)]
+#![feature(stmt_expr_attributes)]
+
+fn main() {
+    // removing the `;` would turn the stmt into an expr, but attrs aren't allowed on exprs
+    // -- but not with the feature enabled
+    #[rustfmt::skip]
+    match 0 {
+        0b00 => {}  0b01 => {}
+        0b11 => {}  _    => {}
+    }
+    //~^ unnecessary_semicolon
+}
diff --git a/tests/ui/unnecessary_semicolon_feature_stmt_expr_attributes.rs b/tests/ui/unnecessary_semicolon_feature_stmt_expr_attributes.rs
new file mode 100644
index 000000000000..e45fe71e22e0
--- /dev/null
+++ b/tests/ui/unnecessary_semicolon_feature_stmt_expr_attributes.rs
@@ -0,0 +1,13 @@
+#![warn(clippy::unnecessary_semicolon)]
+#![feature(stmt_expr_attributes)]
+
+fn main() {
+    // removing the `;` would turn the stmt into an expr, but attrs aren't allowed on exprs
+    // -- but not with the feature enabled
+    #[rustfmt::skip]
+    match 0 {
+        0b00 => {}  0b01 => {}
+        0b11 => {}  _    => {}
+    };
+    //~^ unnecessary_semicolon
+}
diff --git a/tests/ui/unnecessary_semicolon_feature_stmt_expr_attributes.stderr b/tests/ui/unnecessary_semicolon_feature_stmt_expr_attributes.stderr
new file mode 100644
index 000000000000..3e98a92ef299
--- /dev/null
+++ b/tests/ui/unnecessary_semicolon_feature_stmt_expr_attributes.stderr
@@ -0,0 +1,11 @@
+error: unnecessary semicolon
+  --> tests/ui/unnecessary_semicolon_feature_stmt_expr_attributes.rs:11:6
+   |
+LL |     };
+   |      ^ help: remove
+   |
+   = note: `-D clippy::unnecessary-semicolon` implied by `-D warnings`
+   = help: to override `-D warnings` add `#[allow(clippy::unnecessary_semicolon)]`
+
+error: aborting due to 1 previous error
+