diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs
index 0a198e0f..6723c398 100644
--- a/PROMS/Volian.Controls.Library/DisplaySearch.cs
+++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs
@@ -109,9 +109,11 @@ namespace Volian.Controls.Library
 			get { return _MyROFSTLookup; }
 			set
 			{
+				bool beforeIsNotNull = _MyROFSTLookup != null;
+				bool afterIsNotNull = value != null;
 				//if (!Visible) return;		// don't reset anything if the form is invisible.
 				_MyROFSTLookup = value;			// define the tree nodes based on this rofst
-				LoadROComboTree();
+				if(beforeIsNotNull || afterIsNotNull)LoadROComboTree();// B2017-215 Added logic so that database is not accessed during initialization.
 			}
 		}
 		private bool _LoadingList = false;