diff --git a/lib/models/DataField.class.php b/lib/models/DataField.class.php
index 441db450662460720a87d2b54afef362a3b115c6..43a6bb3ae0513826c4c23c9c56abc9da0d1b8456 100644
--- a/lib/models/DataField.class.php
+++ b/lib/models/DataField.class.php
@@ -98,7 +98,11 @@ class DataField extends SimpleORMap implements PrivacyObject
         }
 
         if ($objectClass) {
-            $condition = ['object_class & ?'];
+            if (in_array($objectType, ['user', 'userinstrole', 'usersemdata', 'roleinstdata'])) {
+                $condition = ['object_class & ?'];
+            } else {
+                $condition = ['object_class = ?'];
+            }
             if ($includeNullClass) {
                 $condition[] = 'object_class IS NULL';
             }