diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c
index 97f517bc7f..ac1007466a 100644
--- a/epan/dissectors/packet-nas_eps.c
+++ b/epan/dissectors/packet-nas_eps.c
@@ -3346,10 +3346,11 @@ de_esm_pdn_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
 {
     guint32 curr_offset;
     guint8  pdn_type;
+    ws_in6_addr   interface_id;
 
+    memset(&interface_id, 0, sizeof(interface_id));
     curr_offset = offset;
 
-
     pdn_type  = tvb_get_guint8(tvb, offset) & 0x7;
     proto_tree_add_bits_item(tree, hf_nas_eps_spare_bits, tvb, curr_offset<<3, 5, ENC_BIG_ENDIAN);
     proto_tree_add_item(tree, hf_nas_eps_esm_pdn_type, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
@@ -3367,7 +3368,8 @@ de_esm_pdn_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
              * contains an IPv6 interface identifier. Bit 8 of octet 4 represents the most significant bit
              * of the IPv6 interface identifier and bit 1 of octet 11 the least significant bit.
              */
-            proto_tree_add_item(tree, hf_nas_eps_esm_pdn_ipv6_if_id, tvb, curr_offset, 8, ENC_NA);
+            tvb_memcpy(tvb, (guint8*)&interface_id.bytes[8], offset, 8);
+            proto_tree_add_ipv6(tree, hf_nas_eps_esm_pdn_ipv6_if_id, tvb, offset, 8, &interface_id);
             curr_offset+=8;
             break;
         case 3:
@@ -3378,7 +3380,8 @@ de_esm_pdn_addr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
              * significant bit. Bit 8 of octet 12 represents the most significant bit of the IPv4 address
              * and bit 1 of octet 15 the least significant bit.
              */
-            proto_tree_add_item(tree, hf_nas_eps_esm_pdn_ipv6_if_id, tvb, curr_offset, 8, ENC_NA);
+            tvb_memcpy(tvb, (guint8*)&interface_id.bytes[8], offset, 8);
+            proto_tree_add_ipv6(tree, hf_nas_eps_esm_pdn_ipv6_if_id, tvb, offset, 8, &interface_id);
             curr_offset+=8;
             proto_tree_add_item(tree, hf_nas_eps_esm_pdn_ipv4, tvb, curr_offset, 4, ENC_BIG_ENDIAN);
             curr_offset+=4;
@@ -7886,7 +7889,7 @@ proto_register_nas_eps(void)
     },
     { &hf_nas_eps_esm_pdn_ipv6_if_id,
         {"PDN IPv6 if id", "nas_eps.esm.pdn_ipv6_if_id",
-        FT_BYTES, BASE_NONE, NULL, 0x0,
+        FT_IPv6, BASE_NONE, NULL, 0x0,
         NULL, HFILL}
     },
     { &hf_nas_eps_esm_eplmnc,