diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js
index f4aa500f..2229cba3 100644
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -818,9 +818,13 @@ class Inbound extends XrayCommonClass {
     isExpiry(index) {
         switch (this.protocol) {
             case Protocols.VMESS:
-                return this.settings.vmesses[index].expiryTime < new Date().getTime();
+                if(this.settings.vmesses[index]._expiryTime != null)
+                    return this.settings.vmesses[index]._expiryTime < new Date().getTime();
+                return false
             case Protocols.VLESS:
-                return this.settings.vlesses[index].expiryTime < new Date().getTime();
+                if(this.settings.vlesses[index]._expiryTime != null)
+                    return this.settings.vlesses[index]._expiryTime < new Date().getTime();
+                return false
             default:
                 return false;
         }
@@ -1197,14 +1201,14 @@ Inbound.VmessSettings.Vmess = class extends XrayCommonClass {
         );
     }
     get _expiryTime() {
-        if (this.expiryTime === 0) {
+        if (this.expiryTime === 0 || this.expiryTime === "") {
             return null;
         }
         return moment(this.expiryTime);
     }
 
     set _expiryTime(t) {
-        if (t == null) {
+        if (t == null || t === "") {
             this.expiryTime = 0;
         } else {
             this.expiryTime = t.valueOf();
@@ -1256,14 +1260,14 @@ Inbound.VLESSSettings = class extends Inbound.Settings {
         };
     }
     get _expiryTime() {
-        if (this.expiryTime === 0) {
+        if (this.expiryTime === 0 || this.expiryTime === "") {
             return null;
         }
         return moment(this.expiryTime);
     }
 
     set _expiryTime(t) {
-        if (t == null) {
+        if (t == null || t === "") {
             this.expiryTime = 0;
         } else {
             this.expiryTime = t.valueOf();
diff --git a/web/html/xui/form/protocol/vmess.html b/web/html/xui/form/protocol/vmess.html
index 223ffea2..4a03341a 100644
--- a/web/html/xui/form/protocol/vmess.html
+++ b/web/html/xui/form/protocol/vmess.html
@@ -3,7 +3,7 @@
 <a-collapse activeKey="0"  v-for="(vmess, index) in inbound.settings.vmesses"
 :key="`vmess-${index}`">
     <a-collapse-panel :header="getHeaderText(vmess.email)">
-        <a-tag v-if="isExpiry(index) || (getUpStats(vmess.email) + getDownStats(vmess.email)) > vmess.totalGB" color="red" style="margin-bottom: 10px;display: block;text-align: center;">Account is (Expired|Traffic Ended) And Disabled</a-tag>
+        <a-tag v-if="isExpiry(index) || ((getUpStats(vmess.email) + getDownStats(vmess.email)) > vmess.totalGB && vmess.totalGB != 0)" color="red" style="margin-bottom: 10px;display: block;text-align: center;">Account is (Expired|Traffic Ended) And Disabled</a-tag>
 
         <a-form layout="inline">
             <a-form-item label="Email">