diff --git a/internal/handlers/invoices.go b/internal/handlers/invoices.go
index 0b4f995..3e6e0bd 100644
--- a/internal/handlers/invoices.go
+++ b/internal/handlers/invoices.go
@@ -5,6 +5,7 @@ import (
 	"log"
 	"marmic/servicetrade-toolbox/internal/api"
 	"net/http"
+	"strings"
 )
 
 func InvoicesHandler(w http.ResponseWriter, r *http.Request) {
@@ -30,14 +31,15 @@ func InvoicesHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func handleInvoiceSearch(w http.ResponseWriter, r *http.Request, session *api.Session) {
-	invoiceIdentifier := r.URL.Query().Get("search")
+	searchTerm := strings.TrimSpace(r.URL.Query().Get("search"))
 
-	if invoiceIdentifier == "" {
-		w.Write([]byte(""))
+	if searchTerm == "" {
+		log.Println("Empty search term, returning empty response")
+		w.WriteHeader(http.StatusOK)
 		return
 	}
 
-	invoice, err := session.GetInvoice(invoiceIdentifier)
+	invoice, err := session.GetInvoice(searchTerm)
 	if err != nil {
 		log.Printf("Error fetching invoice: %v", err)
 		w.WriteHeader(http.StatusInternalServerError)