diff --git a/layouts/v7/modules/Settings/LayoutEditor/FieldsList.tpl b/layouts/v7/modules/Settings/LayoutEditor/FieldsList.tpl
index d6ee0f10f577c3e6f178f854f65f49c22d96db54..415f2d7dd203a22b68388e00f955a4d13d421912 100644
--- a/layouts/v7/modules/Settings/LayoutEditor/FieldsList.tpl
+++ b/layouts/v7/modules/Settings/LayoutEditor/FieldsList.tpl
@@ -167,7 +167,7 @@
 															<div class="defaultValue col-sm-12 {if !$FIELD_MODEL->hasDefaultValue()}disabled{/if} 
 																 {if $FIELD_MODEL->isDefaultValueOptionDisabled()} cursorPointerNotAllowed {/if}">
 																{assign var=DEFAULT_VALUE value=$FIELD_MODEL->getDefaultFieldValueToViewInV7FieldsLayOut()}
-																{if $DEFAULT_VALUE}
+																{if isset($DEFAULT_VALUE) && $DEFAULT_VALUE !== ''}
 																	{if is_array($DEFAULT_VALUE)}
 																		{foreach key=DEFAULT_FIELD_NAME item=DEFAULT_FIELD_VALUE from=$DEFAULT_VALUE}
 																			<div class="row">
@@ -341,7 +341,7 @@
 															<div class="defaultValue col-sm-12 {if !$FIELD_MODEL->hasDefaultValue()}disabled{/if} 
 																 {if $FIELD_MODEL->isDefaultValueOptionDisabled()} cursorPointerNotAllowed {/if}">
 																{assign var=DEFAULT_VALUE value=$FIELD_MODEL->getDefaultFieldValueToViewInV7FieldsLayOut()}
-																{if $DEFAULT_VALUE}
+																{if isset($DEFAULT_VALUE) && $DEFAULT_VALUE !== ''}
 																	{if is_array($DEFAULT_VALUE)}
 																		{foreach key=DEFAULT_FIELD_NAME item=DEFAULT_FIELD_VALUE from=$DEFAULT_VALUE}
 																			<div class="row defaultValueContent">
diff --git a/modules/Inventory/models/EditRecordStructure.php b/modules/Inventory/models/EditRecordStructure.php
index 31cb9d31cbb26a510470b0c26640b984c05f3390..4ae490f02bb0a3c76355d51e8850761b10d250fd 100644
--- a/modules/Inventory/models/EditRecordStructure.php
+++ b/modules/Inventory/models/EditRecordStructure.php
@@ -40,7 +40,7 @@ class Inventory_EditRecordStructure_Model extends Vtiger_EditRecordStructure_Mod
 								$fieldValue = $recordModel->getInventoryTermsAndConditions();
 							} else if($fieldValue == '') {
                                 $defaultValue = $fieldModel->getDefaultFieldValue();
-                                if(!empty($defaultValue) && !$recordId)
+                                if(isset($defaultValue) && $defaultValue !== '' && !$recordId)
 									$fieldValue = $defaultValue;
 							}
 							$fieldModel->set('fieldvalue', $fieldValue);
diff --git a/modules/Settings/LayoutEditor/models/Field.php b/modules/Settings/LayoutEditor/models/Field.php
index 554b4b7e2cddfe2e4df403dca40bd96af2530eb9..b3d7bf7ab8bd183c5cf2a6948330b159af183f8e 100644
--- a/modules/Settings/LayoutEditor/models/Field.php
+++ b/modules/Settings/LayoutEditor/models/Field.php
@@ -438,7 +438,7 @@ class Settings_LayoutEditor_Field_Model extends Vtiger_Field_Model {
 	public function getDefaultFieldValueToViewInV7FieldsLayOut() {
 		$defaultValue = $this->getDefaultFieldValue();
 
-		if ($defaultValue) {
+		if (isset($defaultValue) && $defaultValue !== '') {
 			if ($this->getFieldDataType() == 'currency') {
 				//The argument for $skipformatting parameter is passed false to get value with user preference.
 				$defaultValue = $this->getCurrencyDisplayValue($defaultValue, false);
diff --git a/modules/Vtiger/models/EditRecordStructure.php b/modules/Vtiger/models/EditRecordStructure.php
index c72069e3859d0ab62890e08039edd9dbb431ab99..810792a39e3f517007778f5d2f1c60a8b8c049c6 100644
--- a/modules/Vtiger/models/EditRecordStructure.php
+++ b/modules/Vtiger/models/EditRecordStructure.php
@@ -37,7 +37,7 @@ class Vtiger_EditRecordStructure_Model extends Vtiger_RecordStructure_Model {
 							$fieldModel->set('fieldvalue', $recordModel->get($fieldName));
 						}else{
 							$defaultValue = $fieldModel->getDefaultFieldValue();
-							if(!empty($defaultValue) && !$recordId)
+							if(isset($defaultValue) && $defaultValue !== '' && !$recordId)
 								$fieldModel->set('fieldvalue', $defaultValue);
 						}
 						$values[$blockLabel][$fieldName] = $fieldModel;
diff --git a/modules/Vtiger/models/Field.php b/modules/Vtiger/models/Field.php
index 863bc0cc88e84a2a40b9d442b63ec262a8cadaa1..bea03b48423c78862e40410d743c68193cd137fb 100644
--- a/modules/Vtiger/models/Field.php
+++ b/modules/Vtiger/models/Field.php
@@ -1348,7 +1348,7 @@ class Vtiger_Field_Model extends Vtiger_Field {
 	}
 
 	public function hasDefaultValue() {
-		return !$this->defaultvalue || trim($this->defaultvalue) == '' ? false : true;
+		return isset($this->defaultvalue) && trim($this->defaultvalue) !== '';
 	}
 
 	public function isActiveField() {