2 files changed, 6 insertions, 4 deletions

diff --git a/client/src/app/header/header.component.ts b/client/src/app/header/header.component.ts
index a903048f2..6b0ee67ff 100644
--- a/client/src/app/header/header.component.ts
+++ b/client/src/app/header/header.component.ts
@@ -19,8 +19,6 @@ export class HeaderComponent implements OnInit {
   }
 
   doSearch () {
-    if (!this.searchValue) return
-
     this.router.navigate([ '/videos', 'search' ], {
       queryParams: { search: this.searchValue }
     })
diff --git a/client/src/app/videos/video-list/video-search.component.ts b/client/src/app/videos/video-list/video-search.component.ts
index 788797a4c..67857a0a9 100644
--- a/client/src/app/videos/video-list/video-search.component.ts
+++ b/client/src/app/videos/video-list/video-search.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
+import { RedirectService } from '@app/core'
 import { immutableAssign } from '@app/shared/misc/utils'
 import { NotificationsService } from 'angular2-notifications'
 import { Subscription } from 'rxjs/Subscription'
@@ -26,7 +27,9 @@ export class VideoSearchComponent extends AbstractVideoList implements OnInit, O
                protected route: ActivatedRoute,
                protected notificationsService: NotificationsService,
                protected authService: AuthService,
-               private videoService: VideoService) {
+               private videoService: VideoService,
+               private redirectService: RedirectService
+  ) {
     super()
   }
 
@@ -36,7 +39,8 @@ export class VideoSearchComponent extends AbstractVideoList implements OnInit, O
     this.subActivatedRoute = this.route.queryParams.subscribe(
       queryParams => {
         const querySearch = queryParams['search']
-        if (!querySearch || this.otherRouteParams.search === querySearch) return
+        if (!querySearch) return this.redirectService.redirectToHomepage()
+        if (this.otherRouteParams.search === querySearch) return
 
         this.otherRouteParams.search = querySearch
         this.reloadVideos()