diff --git a/user_default_page.module b/user_default_page.module
index fc22256..faf411d 100644
--- a/user_default_page.module
+++ b/user_default_page.module
@@ -77,9 +77,11 @@ function user_default_page_user_login($account){
       $login_message = $entity->get_login_redirect_message();
     }
   }
-  if(($login_redirect) && !empty($login_message)){
+  if ($login_redirect) {
     // Set Login redirect message.
-    drupal_set_message(t($login_message));
+    if ($login_message) {
+      drupal_set_message(t($login_message));
+    }
     user_default_page_redirect($login_redirect);
   }
 }