diff --git a/scripts/lua/modules/alert_store/flow_alert_store.lua b/scripts/lua/modules/alert_store/flow_alert_store.lua
index b1920984b7..4b452fe79b 100644
--- a/scripts/lua/modules/alert_store/flow_alert_store.lua
+++ b/scripts/lua/modules/alert_store/flow_alert_store.lua
@@ -416,7 +416,7 @@ function flow_alert_store:format_record(value, no_html)
       reference = reference_html
    }
 
-   flow_cli_ip["label"] = shortenString(hostVisualization(value["cli_ip"], value["cli_name"], value["vlan_id"], true))
+   flow_cli_ip["label"] = hostVisualization(value["cli_ip"], value["cli_name"], value["vlan_id"], true, true)
 
    -- Format Server
  
@@ -434,7 +434,7 @@ function flow_alert_store:format_record(value, no_html)
       reference = reference_html
    }
 
-   flow_srv_ip["label"] = shortenString(hostVisualization(value["srv_ip"], value["srv_name"], value["vlan_id"], true))
+   flow_srv_ip["label"] = hostVisualization(value["srv_ip"], value["srv_name"], value["vlan_id"], true, true)
    
    local flow_cli_port = value["cli_port"]
    local flow_srv_port = value["srv_port"]
diff --git a/scripts/lua/modules/alert_store/host_alert_store.lua b/scripts/lua/modules/alert_store/host_alert_store.lua
index 8dd7bfd4ac..4f50824609 100644
--- a/scripts/lua/modules/alert_store/host_alert_store.lua
+++ b/scripts/lua/modules/alert_store/host_alert_store.lua
@@ -183,7 +183,7 @@ function host_alert_store:format_record(value, no_html)
    }
 
    -- Checking that the name of the host is not empty
-   record[RNAME.IP.name]["label"] = shortenString(hostVisualization(value["ip"], value["name"], value["vlan_id"], true))
+   record[RNAME.IP.name]["label"] = hostVisualization(value["ip"], value["name"], value["vlan_id"], true, true)
 
    record[RNAME.IP.name]["shown_label"] = record[RNAME.IP.name]["label"]
    record[RNAME.IS_VICTIM.name] = ""
diff --git a/scripts/lua/modules/lua_utils.lua b/scripts/lua/modules/lua_utils.lua
index d78001ab30..f1afca26e7 100644
--- a/scripts/lua/modules/lua_utils.lua
+++ b/scripts/lua/modules/lua_utils.lua
@@ -1312,13 +1312,17 @@ end
 
 -- #################################
 
-function hostVisualization(ip, name, vlan, short_version)
+function hostVisualization(ip, name, vlan, short_version, short_name)
    local res = ip
 
    if not isEmptyString(name) then
       res = name
    end
 
+   if short_name and (short_name == true) then
+      res = shortenString(res)
+   end
+
    if vlan ~= nil and tonumber(vlan) > 0 then
       res = res .. "@" .. getFullVlanName(vlan, short_version)
    end