diff --git a/Mastodon/Scene/Report/ReportStatus/ReportStatusViewController.swift b/Mastodon/Scene/Report/ReportStatus/ReportStatusViewController.swift
index 6f934e13d..f56af1f1e 100644
--- a/Mastodon/Scene/Report/ReportStatus/ReportStatusViewController.swift
+++ b/Mastodon/Scene/Report/ReportStatus/ReportStatusViewController.swift
@@ -59,6 +59,7 @@ class ReportStatusViewController: UIViewController, NeedsDependency, ReportViewC
         let navigationActionView = NavigationActionView()
         navigationActionView.backgroundColor = Asset.Scene.Onboarding.background.color
         navigationActionView.backButton.setTitle(L10n.Common.Controls.Actions.skip, for: .normal)
+        navigationActionView.hidesBackButton = true
         return navigationActionView
     }()
     
diff --git a/Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel.swift b/Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel.swift
index 5b80a9f3a..c1c79af48 100644
--- a/Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel.swift
+++ b/Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel.swift
@@ -71,9 +71,7 @@ class ReportStatusViewModel {
         }
 
         $selectStatuses
-            .map { statuses -> Bool in
-                return status == nil ? !statuses.isEmpty : statuses.count > 1
-            }
+            .map { !$0.isEmpty }
             .assign(to: &$isNextButtonEnabled)
     }