diff --git a/packages/legacy/core/App/screens/CredentialOffer.tsx b/packages/legacy/core/App/screens/CredentialOffer.tsx
index 402e5d9aeb..007b9d0d78 100644
--- a/packages/legacy/core/App/screens/CredentialOffer.tsx
+++ b/packages/legacy/core/App/screens/CredentialOffer.tsx
@@ -25,6 +25,7 @@ import { DispatchAction } from '../contexts/reducers/store'
 import { useStore } from '../contexts/store'
 import { useTheme } from '../contexts/theme'
 import { useTour } from '../contexts/tour/tour-context'
+import { useOutOfBandByConnectionId } from '../hooks/connections'
 import { BifoldError } from '../types/error'
 import { TabStacks, NotificationStackParams, Screens } from '../types/navigators'
 import { ModalUsage } from '../types/remove'
@@ -62,6 +63,7 @@ const CredentialOffer: React.FC<CredentialOfferProps> = ({ navigation, route })
   const [store, dispatch] = useStore()
   const { start } = useTour()
   const screenIsFocused = useIsFocused()
+  const goalCode = useOutOfBandByConnectionId(credential?.connectionId ?? '')?.outOfBandInvitation.goalCode
 
   const styles = StyleSheet.create({
     headerTextContainer: {
@@ -220,7 +222,9 @@ const CredentialOffer: React.FC<CredentialOfferProps> = ({ navigation, route })
         }}
       >
         {loading ? <RecordLoading /> : null}
-        <ConnectionAlert connectionID={credentialConnectionLabel} />
+        {credentialConnectionLabel && goalCode === 'aries.vc.issue' ? (
+          <ConnectionAlert connectionID={credentialConnectionLabel} />
+        ) : null}
         <View style={styles.footerButton}>
           <Button
             title={t('Global.Accept')}
diff --git a/packages/legacy/core/App/screens/ProofRequest.tsx b/packages/legacy/core/App/screens/ProofRequest.tsx
index 215312bb30..9927b70aa2 100644
--- a/packages/legacy/core/App/screens/ProofRequest.tsx
+++ b/packages/legacy/core/App/screens/ProofRequest.tsx
@@ -494,7 +494,7 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, route }) => {
   const proofPageFooter = () => {
     return (
       <View style={[styles.pageFooter, styles.pageMargin]}>
-        {!loading && proofConnectionLabel && goalCode !== 'aries.vc.verify.once' ? (
+        {!loading && proofConnectionLabel && goalCode === 'aries.vc.verify' ? (
           <ConnectionAlert connectionID={proofConnectionLabel} />
         ) : null}
         <View style={styles.footerButton}>
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/CredentialOffer.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/CredentialOffer.test.tsx.snap
index c4b0fc18d9..3a358ba0ec 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/CredentialOffer.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/CredentialOffer.test.tsx.snap
@@ -28,9 +28,6 @@ exports[`displays a credential offer screen accepting a credential 1`] = `
             }
           }
         >
-          <ConnectionAlert
-            connectionID="faber.agent"
-          />
           <View
             style={
               Object {
@@ -1046,122 +1043,6 @@ exports[`displays a credential offer screen accepting a credential 1`] = `
               }
             }
           >
-            <View
-              style={
-                Object {
-                  "backgroundColor": "#313132",
-                  "borderLeftColor": "#FCBA19",
-                  "borderLeftWidth": 10,
-                  "flex": 1,
-                  "marginVertical": 15,
-                  "paddingLeft": 10,
-                  "paddingVertical": 15,
-                }
-              }
-            >
-              <View
-                style={
-                  Object {
-                    "flexDirection": "row",
-                  }
-                }
-              >
-                <Text
-                  style={
-                    Object {
-                      "color": "#FFFFFF",
-                      "fontSize": 20,
-                      "fontWeight": "bold",
-                      "marginBottom": 5,
-                    }
-                  }
-                >
-                  ConnectionAlert.AddedContacts
-                </Text>
-                <View
-                  accessibilityLabel="ConnectionAlert.WhatAreContacts"
-                  accessibilityRole="button"
-                  accessibilityState={
-                    Object {
-                      "busy": undefined,
-                      "checked": undefined,
-                      "disabled": undefined,
-                      "expanded": undefined,
-                      "selected": undefined,
-                    }
-                  }
-                  accessibilityValue={
-                    Object {
-                      "max": undefined,
-                      "min": undefined,
-                      "now": undefined,
-                      "text": undefined,
-                    }
-                  }
-                  accessible={true}
-                  collapsable={false}
-                  focusable={true}
-                  hitSlop={
-                    Object {
-                      "bottom": 44,
-                      "left": 44,
-                      "right": 44,
-                      "top": 44,
-                    }
-                  }
-                  onClick={[Function]}
-                  onResponderGrant={[Function]}
-                  onResponderMove={[Function]}
-                  onResponderRelease={[Function]}
-                  onResponderTerminate={[Function]}
-                  onResponderTerminationRequest={[Function]}
-                  onStartShouldSetResponder={[Function]}
-                  style={
-                    Object {
-                      "opacity": 1,
-                    }
-                  }
-                  testID="Global.Info"
-                >
-                  <Text
-                    allowFontScaling={false}
-                    selectable={false}
-                    style={
-                      Array [
-                        Object {
-                          "color": undefined,
-                          "fontSize": 30,
-                        },
-                        Object {
-                          "color": "#0099FF",
-                          "marginLeft": 10,
-                        },
-                        Object {
-                          "fontFamily": "Material Design Icons",
-                          "fontStyle": "normal",
-                          "fontWeight": "normal",
-                        },
-                        Object {},
-                      ]
-                    }
-                  >
-                    󰋽
-                  </Text>
-                </View>
-              </View>
-              <Text
-                style={
-                  Object {
-                    "color": "#FFFFFF",
-                    "fontSize": 18,
-                    "fontWeight": "normal",
-                    "marginVertical": 5,
-                  }
-                }
-              >
-                ConnectionAlert.NotificationBodyUpperfaber.agentConnectionAlert.NotificationBodyLower
-              </Text>
-            </View>
             <View
               style={
                 Object {
@@ -1573,9 +1454,6 @@ exports[`displays a credential offer screen declining a credential 1`] = `
             }
           }
         >
-          <ConnectionAlert
-            connectionID="faber.agent"
-          />
           <View
             style={
               Object {
@@ -2591,122 +2469,6 @@ exports[`displays a credential offer screen declining a credential 1`] = `
               }
             }
           >
-            <View
-              style={
-                Object {
-                  "backgroundColor": "#313132",
-                  "borderLeftColor": "#FCBA19",
-                  "borderLeftWidth": 10,
-                  "flex": 1,
-                  "marginVertical": 15,
-                  "paddingLeft": 10,
-                  "paddingVertical": 15,
-                }
-              }
-            >
-              <View
-                style={
-                  Object {
-                    "flexDirection": "row",
-                  }
-                }
-              >
-                <Text
-                  style={
-                    Object {
-                      "color": "#FFFFFF",
-                      "fontSize": 20,
-                      "fontWeight": "bold",
-                      "marginBottom": 5,
-                    }
-                  }
-                >
-                  ConnectionAlert.AddedContacts
-                </Text>
-                <View
-                  accessibilityLabel="ConnectionAlert.WhatAreContacts"
-                  accessibilityRole="button"
-                  accessibilityState={
-                    Object {
-                      "busy": undefined,
-                      "checked": undefined,
-                      "disabled": undefined,
-                      "expanded": undefined,
-                      "selected": undefined,
-                    }
-                  }
-                  accessibilityValue={
-                    Object {
-                      "max": undefined,
-                      "min": undefined,
-                      "now": undefined,
-                      "text": undefined,
-                    }
-                  }
-                  accessible={true}
-                  collapsable={false}
-                  focusable={true}
-                  hitSlop={
-                    Object {
-                      "bottom": 44,
-                      "left": 44,
-                      "right": 44,
-                      "top": 44,
-                    }
-                  }
-                  onClick={[Function]}
-                  onResponderGrant={[Function]}
-                  onResponderMove={[Function]}
-                  onResponderRelease={[Function]}
-                  onResponderTerminate={[Function]}
-                  onResponderTerminationRequest={[Function]}
-                  onStartShouldSetResponder={[Function]}
-                  style={
-                    Object {
-                      "opacity": 1,
-                    }
-                  }
-                  testID="Global.Info"
-                >
-                  <Text
-                    allowFontScaling={false}
-                    selectable={false}
-                    style={
-                      Array [
-                        Object {
-                          "color": undefined,
-                          "fontSize": 30,
-                        },
-                        Object {
-                          "color": "#0099FF",
-                          "marginLeft": 10,
-                        },
-                        Object {
-                          "fontFamily": "Material Design Icons",
-                          "fontStyle": "normal",
-                          "fontWeight": "normal",
-                        },
-                        Object {},
-                      ]
-                    }
-                  >
-                    󰋽
-                  </Text>
-                </View>
-              </View>
-              <Text
-                style={
-                  Object {
-                    "color": "#FFFFFF",
-                    "fontSize": 18,
-                    "fontWeight": "normal",
-                    "marginVertical": 5,
-                  }
-                }
-              >
-                ConnectionAlert.NotificationBodyUpperfaber.agentConnectionAlert.NotificationBodyLower
-              </Text>
-            </View>
             <View
               style={
                 Object {
@@ -3338,9 +3100,6 @@ exports[`displays a credential offer screen renders correctly 1`] = `
             }
           }
         >
-          <ConnectionAlert
-            connectionID="faber.agent"
-          />
           <View
             style={
               Object {
@@ -4356,122 +4115,6 @@ exports[`displays a credential offer screen renders correctly 1`] = `
               }
             }
           >
-            <View
-              style={
-                Object {
-                  "backgroundColor": "#313132",
-                  "borderLeftColor": "#FCBA19",
-                  "borderLeftWidth": 10,
-                  "flex": 1,
-                  "marginVertical": 15,
-                  "paddingLeft": 10,
-                  "paddingVertical": 15,
-                }
-              }
-            >
-              <View
-                style={
-                  Object {
-                    "flexDirection": "row",
-                  }
-                }
-              >
-                <Text
-                  style={
-                    Object {
-                      "color": "#FFFFFF",
-                      "fontSize": 20,
-                      "fontWeight": "bold",
-                      "marginBottom": 5,
-                    }
-                  }
-                >
-                  ConnectionAlert.AddedContacts
-                </Text>
-                <View
-                  accessibilityLabel="ConnectionAlert.WhatAreContacts"
-                  accessibilityRole="button"
-                  accessibilityState={
-                    Object {
-                      "busy": undefined,
-                      "checked": undefined,
-                      "disabled": undefined,
-                      "expanded": undefined,
-                      "selected": undefined,
-                    }
-                  }
-                  accessibilityValue={
-                    Object {
-                      "max": undefined,
-                      "min": undefined,
-                      "now": undefined,
-                      "text": undefined,
-                    }
-                  }
-                  accessible={true}
-                  collapsable={false}
-                  focusable={true}
-                  hitSlop={
-                    Object {
-                      "bottom": 44,
-                      "left": 44,
-                      "right": 44,
-                      "top": 44,
-                    }
-                  }
-                  onClick={[Function]}
-                  onResponderGrant={[Function]}
-                  onResponderMove={[Function]}
-                  onResponderRelease={[Function]}
-                  onResponderTerminate={[Function]}
-                  onResponderTerminationRequest={[Function]}
-                  onStartShouldSetResponder={[Function]}
-                  style={
-                    Object {
-                      "opacity": 1,
-                    }
-                  }
-                  testID="Global.Info"
-                >
-                  <Text
-                    allowFontScaling={false}
-                    selectable={false}
-                    style={
-                      Array [
-                        Object {
-                          "color": undefined,
-                          "fontSize": 30,
-                        },
-                        Object {
-                          "color": "#0099FF",
-                          "marginLeft": 10,
-                        },
-                        Object {
-                          "fontFamily": "Material Design Icons",
-                          "fontStyle": "normal",
-                          "fontWeight": "normal",
-                        },
-                        Object {},
-                      ]
-                    }
-                  >
-                    󰋽
-                  </Text>
-                </View>
-              </View>
-              <Text
-                style={
-                  Object {
-                    "color": "#FFFFFF",
-                    "fontSize": 18,
-                    "fontWeight": "normal",
-                    "marginVertical": 5,
-                  }
-                }
-              >
-                ConnectionAlert.NotificationBodyUpperfaber.agentConnectionAlert.NotificationBodyLower
-              </Text>
-            </View>
             <View
               style={
                 Object {