diff --git a/src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.html b/src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.html
index 2bd13441d..4ef9255fb 100644
--- a/src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.html
+++ b/src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.html
@@ -1,14 +1,13 @@
 <div class="small-middle-container" >
-
     <div *ngIf="loadingFlag" class="row justify-content-md-center top-spacing loading-spinner">
         <mat-spinner [color]="'accent'"></mat-spinner>
     </div>
-    <div *ngIf="discoverResults && discoverResults.length > 0" class="row full-height discoverResults col" >
+    <div *ngIf="discoverResults.length > 0" class="row full-height discoverResults col" >
         <div id="searchResults" class="col-xl-2 col-lg-3 col-md-3 col-6 col-sm-4 small-padding" *ngFor="let result of discoverResults" data-test="searchResultsCount" attr.search-count="{{discoverResults.length}}">
             <discover-card [isAdmin]="isAdmin" [result]="result"></discover-card>
         </div>
     </div>
-    <div *ngIf="!discoverResults || discoverResults.length === 0">
+    <div *ngIf="!loadingFlag && discoverResults.length === 0">
         <div class="row justify-content-md-center top-spacing loading-spinner">
             <h1 id="noSearchResult"> {{'Discovery.NoSearch' | translate}} <i class="far fa-frown" aria-hidden="true"></i></h1>
         </div>
diff --git a/src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.ts b/src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.ts
index bef8bae03..f0258b97d 100644
--- a/src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.ts
+++ b/src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.ts
@@ -50,7 +50,6 @@ export class DiscoverSearchResultsComponent implements OnInit {
             this.clear();
             this.loadAdvancedData();
         });
-
     }
 
     public async ngOnInit() {
@@ -79,8 +78,7 @@ export class DiscoverSearchResultsComponent implements OnInit {
         await this.search();
     }
 
-    public createInitalModel() {
-        this.finishLoading();
+    private createInitialModel() {
         this.results.forEach(m => {
 
             let mediaType = RequestType.movie;
@@ -119,6 +117,7 @@ export class DiscoverSearchResultsComponent implements OnInit {
                 tvMovieDb: mediaType === RequestType.tvShow ? true : false
             });
         });
+        this.finishLoading();
     }
 
     private loading() {
@@ -180,6 +179,6 @@ export class DiscoverSearchResultsComponent implements OnInit {
         this.clear();
         this.results = await this.searchService
             .multiSearch(this.searchTerm, this.filter).toPromise();
-        this.createInitalModel();
+        this.createInitialModel();
     }
 }