diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tiles/patient_profile_tile.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tiles/patient_profile_tile.dart
index 1fe19f93..13c6ba82 100644
--- a/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tiles/patient_profile_tile.dart
+++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tiles/patient_profile_tile.dart
@@ -31,9 +31,13 @@ class _PatientProfileTileState extends State<PatientProfileTile> {
         PatientManagerProvider patientManagerProvider =
             context.read<PatientManagerProvider>();
         patientManagerProvider.setPersonalMode(true);
-        context.goNamed(
-          'patientProfile',
-        );
+        if (patientManagerProvider.selectedPatient != null) {
+          context.goNamed(
+            'patientProfile',
+          );
+        } else {
+          context.goNamed("patientProfileSetup");
+        }
         // Navigator.of(context).pushNamed(
         //   '/patient-profile',
         //   arguments: widget.arguments,
diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_profile.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_profile.dart
index 806ff6d7..d0f68be1 100644
--- a/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_profile.dart
+++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_profile.dart
@@ -39,10 +39,7 @@ class _PatientProfileState extends State<PatientProfile> {
       await MihPatientServices()
           .getPatientDetails(app_id, patientManagerProvider);
     }
-    if (patientManagerProvider.selectedPatient == null) {
-      // go to set up patient package
-      context.goNamed("patientProfileSetup");
-    } else {
+    if (patientManagerProvider.selectedPatient != null) {
       await MihPatientServices()
           .getPatientConsultationNotes(patientManagerProvider);
       await MihPatientServices().getPatientDocuments(patientManagerProvider);