diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7a68275a97d..f11fdad877e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -278,6 +278,10 @@ Bug Fixes
 * SOLR-6721: ZkController.ensureReplicaInLeaderInitiatedRecovery puts replica
   in local map before writing to ZK. (shalin)
 
+* SOLR-6679: Remove suggester component from stock solrconfig.xml since
+  it caused long startup times on lage indexes even when it wasn't used.
+  (yonik)
+
 Optimizations
 ----------------------
 
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
index 029fd429b20..8e1a68230c9 100755
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -1441,11 +1441,12 @@
     </arr>
   </requestHandler>
 
+  <!-- This causes long startup times on big indexes, even when never used.  See SOLR-6679
   <searchComponent name="suggest" class="solr.SuggestComponent">
-  	<lst name="suggester">
+    <lst name="suggester">
       <str name="name">mySuggester</str>
-      <str name="lookupImpl">FuzzyLookupFactory</str>      <!-- org.apache.solr.spelling.suggest.fst -->
-      <str name="dictionaryImpl">DocumentDictionaryFactory</str>     <!-- org.apache.solr.spelling.suggest.HighFrequencyDictionaryFactory --> 
+      <str name="lookupImpl">FuzzyLookupFactory</str>      
+      <str name="dictionaryImpl">DocumentDictionaryFactory</str>
       <str name="field">cat</str>
       <str name="weightField">price</str>
       <str name="suggestAnalyzerFieldType">string</str>
@@ -1461,6 +1462,9 @@
       <str>suggest</str>
     </arr>
   </requestHandler>
+  -->
+
+
   <!-- Term Vector Component
 
        http://wiki.apache.org/solr/TermVectorComponent