diff --git a/MacPass/MPPickfieldTableModel.m b/MacPass/MPPickfieldTableModel.m
index a4aef15b..582141d1 100644
--- a/MacPass/MPPickfieldTableModel.m
+++ b/MacPass/MPPickfieldTableModel.m
@@ -51,13 +51,12 @@
   
   for(KPKAttribute *attribute in entry.defaultAttributes) {
     /* TODO exclude protected values */
-    [items addObject:[MPPickfieldTableModelRowItem itemWithName:attribute.key value:attribute.value]];
+    [items addObject:[MPPickfieldTableModelRowItem itemWithName:attribute.key value:(attribute.protect ? @"•••" : attribute.value)]];
   }
 
   [items addObject:[MPPickfieldTableModelRowItem groupItemWithName:NSLocalizedString(@"ENTRY_CUSTOM_ATTRIBUTES", @"Group row for entry attributes")]];
   for(KPKAttribute *attribute in entry.customAttributes) {
-    /* TODO exclude protected values */
-    [items addObject:[MPPickfieldTableModelRowItem itemWithName:attribute.key value:attribute.value]];
+    [items addObject:[MPPickfieldTableModelRowItem itemWithName:attribute.key value:(attribute.protect ? @"•••" : attribute.value)]];
   }
   self.items = items; // copy creates an immutable copy
 }