diff --git a/back/api/api.go b/back/api/api.go
index 754e3c8..5ea90ec 100644
--- a/back/api/api.go
+++ b/back/api/api.go
@@ -10,7 +10,21 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func routes(s *server.Server, cache *map[string]*search.Result) {
+func searchWorker(s *server.Server, cache *map[string]*search.Result, searchQueue chan string) {
+	for id := range searchQueue {
+		s.Mu.RLock()
+		r, exists := (*cache)[id]
+		s.Mu.RUnlock()
+
+		if !exists {
+			continue
+		}
+
+		search.Search(s, r.Query, r, s.Mu)
+	}
+}
+
+func routes(s *server.Server, cache *map[string]*search.Result, searchQueue chan string) {
 	s.Router.Use(
 		func(c *gin.Context) {
 			if s.Settings.Password != "" {
@@ -45,12 +59,16 @@ func routes(s *server.Server, cache *map[string]*search.Result) {
 		var history []historyItem
 		s.Mu.RLock()
 		for _, r := range *cache {
+			resultsCount := 0
+			if r.LeakResult.Rows != nil {
+				resultsCount = len(r.LeakResult.Rows)
+			}
 			history = append(history, historyItem{
 				Id:      r.Id,
 				Status:  r.Status,
 				Date:    r.Date,
 				Query:   r.Query,
-				Results: len(r.LeakResult.Rows),
+				Results: resultsCount,
 			})
 		}
 		s.Mu.RUnlock()
@@ -86,12 +104,18 @@ func routes(s *server.Server, cache *map[string]*search.Result) {
 			return
 		}
 		r := search.Result{
-			Id: id,
+			Id:     id,
+			Date:   time.Now(),
+			Status: "queued",
+			Query:  query,
 		}
-		go search.Search(s, query, &r, s.Mu)
+
 		s.Mu.Lock()
 		(*cache)[id] = &r
 		s.Mu.Unlock()
+
+		searchQueue <- id
+
 		c.JSON(http.StatusOK, gin.H{"Id": id})
 	})
 
@@ -117,6 +141,7 @@ func Init(s *server.Server) {
 	s.Router.Use(CORSMiddleware())
 
 	cache := make(map[string]*search.Result)
+	searchQueue := make(chan string, 100)
 
 	go func() {
 		for {
@@ -125,7 +150,9 @@ func Init(s *server.Server) {
 		}
 	}()
 
-	routes(s, &cache)
+	go searchWorker(s, &cache, searchQueue)
+
+	routes(s, &cache, searchQueue)
 }
 
 func deleteOldCache(s *server.Server, cache *map[string]*search.Result) {
diff --git a/back/search/search.go b/back/search/search.go
index 896bb2b..b2a55ca 100644
--- a/back/search/search.go
+++ b/back/search/search.go
@@ -27,7 +27,7 @@ type Query struct {
 type Result struct {
 	Id     string
 	Date   time.Time
-	Status string // "pending", "completed"
+	Status string // "queued", "pending", "completed"
 	Query  Query
 
 	LeakResult     dataleak.LeakResult
@@ -39,9 +39,7 @@ func Search(s *server.Server, q Query, r *Result, mu *sync.RWMutex) {
 	var wg sync.WaitGroup
 
 	mu.Lock()
-	r.Date = time.Now()
 	r.Status = "pending"
-	r.Query = q
 	mu.Unlock()
 
 	wg.Add(3)
diff --git a/front/src/lib/components/index/search/history.svelte b/front/src/lib/components/index/search/history.svelte
index 3ea5b2c..2ec3472 100644
--- a/front/src/lib/components/index/search/history.svelte
+++ b/front/src/lib/components/index/search/history.svelte
@@ -88,6 +88,7 @@
                   class="badge badge-xs"
                   class:badge-success={item.Status === "completed"}
                   class:badge-warning={item.Status === "pending"}
+                  class:badge-neutral={item.Status === "queued"}
                 >
                   {item.Status}
                 </div></td
diff --git a/front/src/lib/types.ts b/front/src/lib/types.ts
index d52ae7f..8ace43c 100644
--- a/front/src/lib/types.ts
+++ b/front/src/lib/types.ts
@@ -36,7 +36,7 @@ export type GravatarResult = {
 
 export type Result = {
   Id: string;
-  Status: "pending" | "completed";
+  Status: "queued" | "pending" | "completed";
   Date: string;
   Query: Query;
   LeakResult: LeakResult;
@@ -46,7 +46,7 @@ export type Result = {
 
 export type HistoryItem = {
   Id: string;
-  Status: "pending" | "completed";
+  Status: "queued" | "pending" | "completed";
   Date: string;
   Query: Query;
   Results: number;