diff --git a/app/integration_test/drugs_test.dart b/app/integration_test/drugs_test.dart
index eb2812d9..8c3a4899 100644
--- a/app/integration_test/drugs_test.dart
+++ b/app/integration_test/drugs_test.dart
@@ -186,7 +186,6 @@ void main() {
       );
 
       expect(find.text(testDrugWithoutGuidelines.name), findsOneWidget);
-      expect(find.byType(Disclaimer), findsNothing);
     });
 
     testWidgets('test loading', (tester) async {
diff --git a/app/lib/drug/widgets/annotation_cards/disclaimer.dart b/app/lib/drug/widgets/annotation_cards/disclaimer.dart
index fed1f6f1..1ad4181c 100644
--- a/app/lib/drug/widgets/annotation_cards/disclaimer.dart
+++ b/app/lib/drug/widgets/annotation_cards/disclaimer.dart
@@ -1,10 +1,9 @@
 import '../../../common/module.dart';
 
 class Disclaimer extends StatelessWidget {
-  const Disclaimer({ this.description, this.text });
+  const Disclaimer({ this.userGuideline });
 
-  final String? description;
-  final String? text;
+  final Guideline? userGuideline;
 
   @override
   Widget build(BuildContext context) {
@@ -28,19 +27,25 @@ class Disclaimer extends StatelessWidget {
           ),
           TextSpan(text: ' '),
           TextSpan(
-            text: description ?? context.l10n.drugs_page_disclaimer_description,
+            text: context.l10n.drugs_page_disclaimer_description,
             style: TextStyle(fontWeight: FontWeight.bold),
           ),
-          if (text != null) TextSpan(text: text),
-          if (text == null) TextSpan(children: [
-            TextSpan(text: context.l10n.drugs_page_disclaimer_text_part_1),
-            TextSpan(text: ' '),
-            TextSpan(text: context.l10n.drugs_page_disclaimer_text_part_2),
-          ])
+          TextSpan(
+            text: context.l10n.drugs_page_disclaimer_text_part_0,
+            style: TextStyle(fontWeight: FontWeight.w500),
+          ),
+          if (userGuideline != null) TextSpan(
+            children: [
+              TextSpan(text: '\n\n'),
+              TextSpan(text: context.l10n.drugs_page_disclaimer_text_part_1),
+              TextSpan(text: ' '),
+              TextSpan(text: context.l10n.drugs_page_disclaimer_text_part_2),
+            ],
+            style: PharMeTheme.textTheme.labelMedium!.copyWith(
+              fontWeight: FontWeight.w300,
+            ),
+          )
         ]),
-        style: PharMeTheme.textTheme.labelMedium!.copyWith(
-          fontWeight: FontWeight.w300,
-        ),
       ),
     );
   }
diff --git a/app/lib/drug/widgets/annotation_cards/guideline.dart b/app/lib/drug/widgets/annotation_cards/guideline.dart
index 24581335..04689192 100644
--- a/app/lib/drug/widgets/annotation_cards/guideline.dart
+++ b/app/lib/drug/widgets/annotation_cards/guideline.dart
@@ -151,9 +151,9 @@ class GuidelineAnnotationCard extends StatelessWidget {
               TextSpan(text: recommendationText),
             ]),
           ),
-          if (drug.userGuideline != null) ...[
+          ...[
             SizedBox(height: PharMeTheme.smallToMediumSpace),
-            Disclaimer(),
+            Disclaimer(userGuideline: drug.userGuideline),
           ],
         ]
       )
diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb
index c5397c33..9cb5dcb0 100644
--- a/app/lib/l10n/app_en.arb
+++ b/app/lib/l10n/app_en.arb
@@ -87,7 +87,8 @@
     }
   },
   "drugs_page_disclaimer_description": "Please note: ",
-  "drugs_page_disclaimer_text_part_1": "The information shown on this page is ONLY based on your DNA and certain medications you are currently taking.",
+  "drugs_page_disclaimer_text_part_0": "Never stop taking or change the dose of your medications without consulting your pharmacist or doctor.",
+  "drugs_page_disclaimer_text_part_1": "Also, the information shown on this page is ONLY based on your DNA and certain medications you are currently taking.",
   "drugs_page_disclaimer_text_part_2": "Other important factors like weight, age, pre-existing conditions, and further medication interactions are not considered.",
   "drugs_page_is_inhibitor": "Taking {drugName} can interact with your results for the following gene(s): {genes}",
   "@drugs_page_is_inhibitor": {