diff --git a/packages/geo/src/lib/search/shared/sources/icherche.ts b/packages/geo/src/lib/search/shared/sources/icherche.ts
index 030b66e4fd..9ac2a7ac34 100644
--- a/packages/geo/src/lib/search/shared/sources/icherche.ts
+++ b/packages/geo/src/lib/search/shared/sources/icherche.ts
@@ -1,5 +1,5 @@
 import { Injectable, Inject, Injector } from '@angular/core';
-import { HttpClient, HttpParams } from '@angular/common/http';
+import { HttpClient, HttpParams, HttpParameterCodec } from '@angular/common/http';
 
 import { Observable, of, BehaviorSubject } from 'rxjs';
 import { map, catchError } from 'rxjs/operators';
@@ -36,6 +36,26 @@ export class IChercheSearchResultFormatter {
   }
 }
 
+// Fix the "+" is replaced with space " " in a query string
+// https://github.com/angular/angular/issues/11058
+export class IgoHttpParameterCodec implements HttpParameterCodec {
+  encodeKey(key: string): string {
+    return encodeURIComponent(key);
+  }
+
+  encodeValue(value: string): string {
+    return encodeURIComponent(value);
+  }
+
+  decodeKey(key: string): string {
+    return decodeURIComponent(key);
+  }
+
+  decodeValue(value: string): string {
+    return decodeURIComponent(value);
+  }
+}
+
 /**
  * ICherche search source
  */
@@ -388,7 +408,8 @@ export class IChercheSearchSource extends SearchSource implements TextSearch {
     }
 
     return new HttpParams({
-      fromObject: ObjectUtils.removeUndefined(queryParams)
+      fromObject: ObjectUtils.removeUndefined(queryParams),
+      encoder: new IgoHttpParameterCodec()
     });
   }