diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
index befb8d180a0..b4a08922a4a 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -93,8 +93,6 @@ public partial class DynamoViewModel : ViewModelBase, IDynamoViewModel
 
         internal DynamoMLDataPipelineExtension MLDataPipelineExtension { get; set; }
 
-        internal static Dictionary<string, NodeSearchElementViewModel> DefaultAutocompleteCandidates = new Dictionary<string, NodeSearchElementViewModel>();
-
         /// <summary>
         /// Collection of Right SideBar tab items: view extensions and docked windows.
         /// </summary>
diff --git a/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs
index 3b60b9a4d59..c4f7732753d 100644
--- a/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs
@@ -185,24 +185,15 @@ private void InitializeDefaultAutoCompleteCandidates()
             // TODO: These are basic input types in Dynamo
             // This should be only served as a temporary default case.
             var queries = new List<string>(){"String", "Number Slider", "Integer Slider", "Number", "Boolean", "Watch", "Watch 3D", "Python Script"};
-            var nodeNamesList = DynamoViewModel.DefaultAutocompleteCandidates.Keys.ToList();
-            if (nodeNamesList.Where(queries.Contains).Any() == true)
+            foreach (var query in queries)
             {
-                DefaultResults = DynamoViewModel.DefaultAutocompleteCandidates.Values;
-            }
-            else
-            {
-                foreach (var query in queries)
+                var foundNode = Search(query).Where(n => n.Name.Equals(query)).FirstOrDefault();
+                if(foundNode != null)
                 {
-                    var foundNode = Search(query).Where(n => n.Name.Equals(query)).FirstOrDefault();
-                    if (foundNode != null)
-                    {
-                        candidates.Add(foundNode);
-                        DynamoViewModel.DefaultAutocompleteCandidates.Add(foundNode.Name, foundNode);
-                    }
+                    candidates.Add(foundNode);
                 }
-                DefaultResults = candidates;
             }
+            DefaultResults = candidates;
         }
 
         internal MLNodeAutoCompletionRequest GenerateRequestForMLAutocomplete()