diff --git a/lib/ui/pages/dns_details/dns_details.dart b/lib/ui/pages/dns_details/dns_details.dart
index 91c7d007..5a3d0dfd 100644
--- a/lib/ui/pages/dns_details/dns_details.dart
+++ b/lib/ui/pages/dns_details/dns_details.dart
@@ -94,16 +94,8 @@ class _DnsDetailsPageState extends State<DnsDetailsPage> {
         headerTitle: '',
         heroIcon: BrandIcons.globe,
         heroTitle: 'providers.domain.screen_title'.tr(),
-        children: <Widget>[
-          FilledCard(
-            child: ListTile(
-              title: Text(
-                'not_ready_card.in_menu'.tr(),
-                style: Theme.of(context).textTheme.headline6,
-              ),
-            ),
-          ),
-        ],
+        heroSubtitle: 'not_ready_card.in_menu'.tr(),
+        children: const [],
       );
     }
 
diff --git a/lib/ui/pages/services/services.dart b/lib/ui/pages/services/services.dart
index a469d06b..d638866a 100644
--- a/lib/ui/pages/services/services.dart
+++ b/lib/ui/pages/services/services.dart
@@ -115,8 +115,10 @@ class _Card extends StatelessWidget {
     final domainName = UiHelpers.getDomainName(config);
 
     return GestureDetector(
-      onTap: () => Navigator.of(context)
-          .push(materialRoute(ServicePage(serviceId: serviceType.name))),
+      onTap: isReady
+          ? () => Navigator.of(context)
+              .push(materialRoute(ServicePage(serviceId: serviceType.name)))
+          : null,
       child: BrandCards.big(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,