diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
index 565804dea4..12e6ab211f 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
@@ -85,6 +85,8 @@ KeywordSearchFilterNode.getFileActions.searchSameMd5=Search for files with the s
 KeywordSearchFilterNode.getFileActions.viewInNewWinActionLbl=View in New Window
 KeywordSearchIngestModule.init.noKwInLstMsg=No keywords in keyword list.
 KeywordSearchIngestModule.init.onlyIdxKwSkipMsg=Only indexing will be done and keyword search will be skipped (you can still add keyword lists using the Keyword Lists - Add to Ingest).
+KeywordSearchIngestModule.init.SolrIndexingDisabled=Solr indexing is disabled.
+KeywordSearchIngestModule.init.indexingDisabled=Text indexing is disabled. See user manual section "Limitations of Ad Hoc Keyword Search" for details.
 KeywordSearchIngestModule.doInBackGround.displayName=Periodic Keyword Search
 KeywordSearchIngestModule.doInBackGround.finalizeMsg=Finalizing
 KeywordSearchIngestModule.doInBackGround.pendingMsg=(Pending)
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
index 2ff50a4048..0bf48a5370 100755
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
@@ -137,6 +137,8 @@ KeywordSearchFilterNode.getFileActions.searchSameMd5=Search for files with the s
 KeywordSearchFilterNode.getFileActions.viewInNewWinActionLbl=View in New Window
 KeywordSearchIngestModule.init.noKwInLstMsg=No keywords in keyword list.
 KeywordSearchIngestModule.init.onlyIdxKwSkipMsg=Only indexing will be done and keyword search will be skipped (you can still add keyword lists using the Keyword Lists - Add to Ingest).
+KeywordSearchIngestModule.init.SolrIndexingDisabled=Solr indexing is disabled.
+KeywordSearchIngestModule.init.indexingDisabled=Text indexing is disabled. See user manual section "Limitations of Ad Hoc Keyword Search" for details.
 KeywordSearchIngestModule.doInBackGround.displayName=Periodic Keyword Search
 KeywordSearchIngestModule.doInBackGround.finalizeMsg=Finalizing
 KeywordSearchIngestModule.doInBackGround.pendingMsg=(Pending)
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
index cd6f255def..b3a0a1b3b3 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
@@ -318,9 +318,15 @@ public final class KeywordSearchIngestModule implements FileIngestModule {
                         break;
                     }
                 }
-                if (!hasKeywordsForSearch) {
-                    services.postMessage(IngestMessage.createWarningMessage(KeywordSearchModuleFactory.getModuleName(), NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.noKwInLstMsg"),
-                            NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.onlyIdxKwSkipMsg")));
+                
+                if (!settings.isIndexToSolrEnabled()) {
+                    services.postMessage(IngestMessage.createWarningMessage(KeywordSearchModuleFactory.getModuleName(), NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.SolrIndexingDisabled"),
+                            NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.indexingDisabled")));
+                } else {
+                    if (!hasKeywordsForSearch) {
+                        services.postMessage(IngestMessage.createWarningMessage(KeywordSearchModuleFactory.getModuleName(), NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.noKwInLstMsg"),
+                                NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.onlyIdxKwSkipMsg")));
+                    }
                 }
             }
         }