diff --git a/PadelClub/Extensions/Tournament+Extensions.swift b/PadelClub/Extensions/Tournament+Extensions.swift
index 7b09900..76a516d 100644
--- a/PadelClub/Extensions/Tournament+Extensions.swift
+++ b/PadelClub/Extensions/Tournament+Extensions.swift
@@ -430,6 +430,24 @@ extension Tournament: TournamentBuildHolder {
     }
 }
 
+// MARK: - UI extensions
+
+extension Tournament {
+    
+    public var shouldShowPaymentInfo: Bool {
+        if self.payment != nil {
+            return false
+        }
+        switch self.state() {
+        case .initial, .build, .running:
+            return true
+        default:
+            return false
+        }
+    }
+
+}
+
 
 //extension Tournament {
 //    func deadline(for type: TournamentDeadlineType) -> Date? {
diff --git a/PadelClub/Views/Planning/PlanningSettingsView.swift b/PadelClub/Views/Planning/PlanningSettingsView.swift
index 74bf764..2d56d71 100644
--- a/PadelClub/Views/Planning/PlanningSettingsView.swift
+++ b/PadelClub/Views/Planning/PlanningSettingsView.swift
@@ -48,9 +48,8 @@ struct PlanningSettingsView: View {
 
     var body: some View {
         List {
-            if tournament.payment == nil {
+            if tournament.shouldShowPaymentInfo {
                 PaymentStatusView()
-//                SubscriptionInfoView()
             }
 
             Section {
diff --git a/PadelClub/Views/Tournament/TournamentView.swift b/PadelClub/Views/Tournament/TournamentView.swift
index d0fdd52..81a00f9 100644
--- a/PadelClub/Views/Tournament/TournamentView.swift
+++ b/PadelClub/Views/Tournament/TournamentView.swift
@@ -51,9 +51,8 @@ struct TournamentView: View {
     var body: some View {
         VStack(spacing: 0.0) {
             List {
-                if tournament.state() != .finished && tournament.payment == nil {
+                if tournament.shouldShowPaymentInfo {
                     PaymentStatusView()
-//                    SubscriptionInfoView()
                 }
 
                 switch tournament.state() {