diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
index c86919ee645..cc22c698eb8 100644
--- a/src/DynamoCore/Models/DynamoModel.cs
+++ b/src/DynamoCore/Models/DynamoModel.cs
@@ -160,8 +160,8 @@ internal LuceneSearchUtility LuceneUtility
 
         /// <summary>
         /// Flag to indicate that there is no UI on this process, and things
-        /// like the update manager and the analytics collection should be
-        /// disabled.
+        /// like the node index process, update manager and the analytics collection 
+        /// should be disabled.
         /// </summary>
         public static bool IsHeadless { get; set; }
 
diff --git a/src/DynamoCore/Utilities/LuceneSearchUtility.cs b/src/DynamoCore/Utilities/LuceneSearchUtility.cs
index 94e8b518f79..78f3cd9221b 100644
--- a/src/DynamoCore/Utilities/LuceneSearchUtility.cs
+++ b/src/DynamoCore/Utilities/LuceneSearchUtility.cs
@@ -106,6 +106,8 @@ internal LuceneSearchUtility(DynamoModel model, LuceneStartConfig config)
         /// </summary>
         internal void InitializeLuceneConfig()
         {
+            if (DynamoModel.IsHeadless) return;
+
             addedFields = new List<string>();
 
             DirectoryInfo luceneUserDataFolder;