diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.cs b/PROMS/Volian.Controls.Library/AnnotationDetails.cs
index 88381f04..529a8ab7 100644
--- a/PROMS/Volian.Controls.Library/AnnotationDetails.cs
+++ b/PROMS/Volian.Controls.Library/AnnotationDetails.cs
@@ -28,7 +28,8 @@ namespace Volian.Controls.Library
 					get { return _ProcItem; }
 					set 
 					{
-						if (!DesignMode) // B2019-043 need to check if we are just saving changes to the user interface
+						// B2019-054 needed to add a check for value being NULL else we would always get a list of PROMS database to choose from (prematurely)
+						if (!DesignMode && value != null) // B2019-043 need to check if we are just saving changes to the user interface
 						{
 							//if (_ProcItem == value) return; // Jeff (Westinghouse) requested list to be provided every time fixes both C2016-007 and B2016-097
 							_ProcItem = value;