diff --git a/CTFd/models/__init__.py b/CTFd/models/__init__.py
index 751368e2..07949234 100644
--- a/CTFd/models/__init__.py
+++ b/CTFd/models/__init__.py
@@ -346,7 +346,9 @@ class Users(db.Model):
         if admin:
             return self.field_entries
 
-        return [entry for entry in self.field_entries if entry.field.public]
+        return [
+            entry for entry in self.field_entries if entry.field.public and entry.value
+        ]
 
     def get_solves(self, admin=False):
         from CTFd.utils import get_config
@@ -515,7 +517,9 @@ class Teams(db.Model):
         if admin:
             return self.field_entries
 
-        return [entry for entry in self.field_entries if entry.field.public]
+        return [
+            entry for entry in self.field_entries if entry.field.public and entry.value
+        ]
 
     def get_solves(self, admin=False):
         from CTFd.utils import get_config