diff --git a/Resources/Private/Solr/configsets/ext_solr_13_0_0/conf/solrconfig.xml b/Resources/Private/Solr/configsets/ext_solr_13_0_0/conf/solrconfig.xml
index 795a8a0d4..abd5096ba 100644
--- a/Resources/Private/Solr/configsets/ext_solr_13_0_0/conf/solrconfig.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_13_0_0/conf/solrconfig.xml
@@ -131,6 +131,10 @@
 
 
 	<requestHandler name="/select" class="solr.SearchHandler">
+		<str name="hl.usePhraseHighlighter">false</str>
+		<str name="hl.useFastVectorHighlighter">true</str>
+		<str name="hl.boundaryScanner">breakIterator</str>
+
 		<lst name="defaults">
 			<str name="defType">edismax</str>
 			<str name="echoParams">explicit</str>
@@ -458,6 +462,24 @@
 					<str name="hl.tag.post"><![CDATA[</b>]]></str>
 				</lst>
 			</fragmentsBuilder>
+
+			<boundaryScanner name="default" default="false" class="solr.highlight.SimpleBoundaryScanner">
+				<lst name="defaults">
+					<str name="hl.bs.maxScan">10</str>
+					<str name="hl.bs.chars">.,!? &#9;&#10;&#13;</str>
+				</lst>
+			</boundaryScanner>
+
+			<boundaryScanner name="breakIterator" default="true" class="solr.highlight.BreakIteratorBoundaryScanner">
+				<lst name="defaults">
+					<!-- type should be one of CHARACTER, WORD(default), LINE and SENTENCE -->
+					<str name="hl.bs.type">SENTENCE</str>
+					<!-- language and country are used when constructing Locale object.  -->
+					<!-- And the Locale object will be used when getting instance of BreakIterator -->
+					<str name="hl.bs.language">${hl.bs.language}</str>
+					<str name="hl.bs.country">${hl.bs.country}</str>
+				</lst>
+			</boundaryScanner>
 		</highlighting>
 	</searchComponent>
 
diff --git a/Resources/Private/Solr/cores/english/core.properties b/Resources/Private/Solr/cores/english/core.properties
index c0747b335..6434586a1 100644
--- a/Resources/Private/Solr/cores/english/core.properties
+++ b/Resources/Private/Solr/cores/english/core.properties
@@ -2,3 +2,5 @@ configSet=ext_solr_13_0_0
 schema=english/schema.xml
 name=core_en
 dataDir=../../data/english
+hl.bs.language=en
+hl.bs.country=US
diff --git a/Resources/Private/Solr/cores/german/core.properties b/Resources/Private/Solr/cores/german/core.properties
index a8f61599e..feacb395f 100644
--- a/Resources/Private/Solr/cores/german/core.properties
+++ b/Resources/Private/Solr/cores/german/core.properties
@@ -2,3 +2,5 @@ configSet=ext_solr_13_0_0
 schema=german/schema.xml
 name=core_de
 dataDir=../../data/german
+hl.bs.language=de
+hl.bs.country=DE