diff --git a/packages/legacy/core/App/screens/ProofRequest.tsx b/packages/legacy/core/App/screens/ProofRequest.tsx
index e59f9f775c..ebba6c121e 100644
--- a/packages/legacy/core/App/screens/ProofRequest.tsx
+++ b/packages/legacy/core/App/screens/ProofRequest.tsx
@@ -76,6 +76,8 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, route }) => {
   const { start } = useTour()
   const screenIsFocused = useIsFocused()
 
+  const hasMatchingCredDef = useMemo(() => activeCreds.some((cred) => cred.credDefId !== undefined), [activeCreds])
+
   const styles = StyleSheet.create({
     pageContainer: {
       flex: 1,
@@ -458,7 +460,7 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, route }) => {
                 </View>
               )}
             </View>
-            {!hasAvailableCredentials && (
+            {!hasAvailableCredentials && hasMatchingCredDef && (
               <Text
                 style={{
                   ...TextTheme.title,
@@ -582,14 +584,16 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, route }) => {
                 <View style={styles.pageMargin}>
                   {!loading && (
                     <>
-                      <View
-                        style={{
-                          width: 'auto',
-                          borderWidth: 1,
-                          borderColor: ColorPallet.grayscale.lightGrey,
-                          marginTop: 20,
-                        }}
-                      ></View>
+                      {hasMatchingCredDef && (
+                        <View
+                          style={{
+                            width: 'auto',
+                            borderWidth: 1,
+                            borderColor: ColorPallet.grayscale.lightGrey,
+                            marginTop: 20,
+                          }}
+                        />
+                      )}
                       <Text
                         style={{
                           ...TextTheme.title,
diff --git a/packages/legacy/core/App/utils/helpers.ts b/packages/legacy/core/App/utils/helpers.ts
index 597fa72ce3..8174eff90b 100644
--- a/packages/legacy/core/App/utils/helpers.ts
+++ b/packages/legacy/core/App/utils/helpers.ts
@@ -468,10 +468,10 @@ export const processProofAttributes = (
 
     if (credentialList.length <= 0) {
       const missingAttributes = addMissingDisplayAttributes(requestedProofAttributes[key])
-      if (!processedAttributes[key]) {
-        processedAttributes[key] = missingAttributes
+      if (!processedAttributes[missingAttributes.credName]) {
+        processedAttributes[missingAttributes.credName] = missingAttributes
       } else {
-        processedAttributes[key].attributes?.push(...(missingAttributes.attributes ?? []))
+        processedAttributes[missingAttributes.credName].attributes?.push(...(missingAttributes.attributes ?? []))
       }
     }
 
@@ -494,7 +494,6 @@ export const processProofAttributes = (
       } else {
         continue
       }
-
       for (const attributeName of [...(names ?? (name && [name]) ?? [])]) {
         if (!processedAttributes[credential?.credentialId]) {
           // init processedAttributes object
@@ -600,10 +599,10 @@ export const processProofPredicates = (
     const { name, p_type: pType, p_value: pValue, non_revoked } = requestedProofPredicates[key]
     if (credentialList.length <= 0) {
       const missingPredicates = addMissingDisplayPredicates(requestedProofPredicates[key])
-      if (!processedPredicates[key]) {
-        processedPredicates[key] = missingPredicates
+      if (!processedPredicates[missingPredicates.credName]) {
+        processedPredicates[missingPredicates.credName] = missingPredicates
       } else {
-        processedPredicates[key].predicates?.push(...(missingPredicates.predicates ?? []))
+        processedPredicates[missingPredicates.credName].predicates?.push(...(missingPredicates.predicates ?? []))
       }
     }