diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html b/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html
index b893af45c..8d270417d 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html
@@ -57,11 +57,11 @@
                                         <i class="far fa-play-circle fa-2x"></i>
                                     </a>
                                 </ng-container>
-                                <button *ngIf="!tv.fullyAvailable && !allEpisodesRequested()" mat-raised-button id="requestBtn" class="btn-spacing" color="primary"
-                                    (click)="request()"><i class="fas fa-plus"></i>
+                                <button *ngIf="(!tv.fullyAvailable || (tv.fullyAvailable && tv.partlyAvailable)) && !allEpisodesRequestedOrAvailable()" mat-raised-button id="requestBtn" class="btn-spacing" color="primary"
+                                        (click)="request()"><i class="fas fa-plus"></i>
                                     {{ 'Common.Request' | translate }}</button>
 
-                                    <button *ngIf="!tv.denied && allEpisodesRequested()" mat-raised-button class="btn-spacing" color="warn" [disabled]>
+                                    <button *ngIf="!tv.denied && allEpisodesRequestedOrAvailable()" mat-raised-button class="btn-spacing" color="warn" [disabled]>
                                         <i class="fas fa-check"></i>
                                         {{ 'Common.Requested' | translate }}</button>
 
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.ts
index 473417d53..edd531a0b 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.ts
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.ts
@@ -126,9 +126,10 @@ export class TvDetailsComponent implements OnInit {
         }
     }
 
-    public allEpisodesRequested(): boolean {
-        return this.tv.seasonRequests.every(e => e.episodes.every(x => x.approved || x.requested));
+    public allEpisodesRequestedOrAvailable(): boolean {
+      return this.tv.seasonRequests.every(e => e.episodes.every(x => x.available || x.approved || x.requested));
     }
+
     private checkPoster() {
       if (this.tv.images.original == null) {
         this.tv.images.original = "../../../images/default_movie_poster.png";