diff --git a/src/main/java/com/iemr/common/utils/config/ConfigProperties.java b/src/main/java/com/iemr/common/utils/config/ConfigProperties.java
index 59b69b82..43a49364 100644
--- a/src/main/java/com/iemr/common/utils/config/ConfigProperties.java
+++ b/src/main/java/com/iemr/common/utils/config/ConfigProperties.java
@@ -144,11 +144,21 @@ public static String getPropertyByName(String propertyName)
 		String result = null;
 		try
 		{
-			if (properties == null)
+			if (environment != null)
 			{
-				initalizeProperties();
+				result = environment.getProperty(propertyName);
+			}
+			if (result == null)
+			{
+				if (properties == null)
+				{
+					initalizeProperties();
+				}
+				result = properties.getProperty(propertyName).trim();
+			} else
+			{
+				result = result.trim();
 			}
-			result = properties.getProperty(propertyName).trim();
 		} catch (Exception e)
 		{
 			logger.error(propertyName + " retrival failed.", e);