diff --git a/app/Models/EmailNotificationSettings.php b/app/Models/EmailNotificationSettings.php
index ae118986f..445987619 100644
--- a/app/Models/EmailNotificationSettings.php
+++ b/app/Models/EmailNotificationSettings.php
@@ -70,10 +70,6 @@ class EmailNotificationSettings extends Model
 
     public function isEnabled()
     {
-        if (isCloud()) {
-            return true;
-        }
-
         return $this->smtp_enabled || $this->resend_enabled || $this->use_instance_email_settings;
     }
 }
diff --git a/app/Notifications/Test.php b/app/Notifications/Test.php
index 2a0581bbf..0b1d8d6b1 100644
--- a/app/Notifications/Test.php
+++ b/app/Notifications/Test.php
@@ -83,7 +83,7 @@ class Test extends Notification implements ShouldQueue
             'buttons' => [
                 [
                     'text' => 'Go to your dashboard',
-                    'url' => base_url(),
+                    'url' => isDev() ? 'https://staging-but-dev.coolify.io' : base_url(),
                 ],
             ],
         ];