diff --git a/lib/dashboard_latest/dashboard_view.dart b/lib/dashboard_latest/dashboard_view.dart
index 7b240bdb..91c30606 100644
--- a/lib/dashboard_latest/dashboard_view.dart
+++ b/lib/dashboard_latest/dashboard_view.dart
@@ -230,7 +230,7 @@ class _DashboardViewState extends State<DashboardView> {
             ),
           ),
         ),
-        if (user != null && user.employeeIsHMG == false)
+        if (user != null && settingProvider.isUserFlowMedical == false && user.employeeIsHMG == false)
           Positioned(
             right: 20.toScreenWidth,
             bottom: 20.toScreenHeight,
diff --git a/lib/new_views/common_widgets/app_drawer.dart b/lib/new_views/common_widgets/app_drawer.dart
index 7ec66c40..0f6c0a9f 100644
--- a/lib/new_views/common_widgets/app_drawer.dart
+++ b/lib/new_views/common_widgets/app_drawer.dart
@@ -78,7 +78,7 @@ class AppDrawer extends StatelessWidget {
                 18.height,
                 drawerItem("site_request_icon", "Site Request", context).onPress(() => Navigator.of(context).pushNamed(SiteRequestHistoryScreen.routeName)),
                 18.height,
-                if (userProvider.user != null && userProvider.user?.employeeIsHMG == false)
+                if (userProvider.user != null && settingProvider.isUserFlowMedical == false && userProvider.user?.employeeIsHMG == false)
                   drawerItem("swipe", "Swipe History", context).onPress(() => Navigator.of(context).pushNamed(SwipeHistoryView.routeName)),
                 // 18.height,
                 // drawerItem("report", context.translation.reportBg, context) /*.onPress(() => Navigator.of(context).pushNamed(ReportBugPage.id))*/,