diff --git a/src/app/CompanionApp.php b/src/app/CompanionApp.php
index 9de9eb20..15eec18f 100644
--- a/src/app/CompanionApp.php
+++ b/src/app/CompanionApp.php
@@ -1,117 +1,108 @@
 <?php
 
 namespace App;
 
-use Illuminate\Database\Eloquent\Model;
 use App\Traits\UuidStrKeyTrait;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Http;
 
 /**
  * The eloquent definition of a CompanionApp.
  *
  * A CompanionApp is an kolab companion app that the user registered
  */
 class CompanionApp extends Model
 {
     use UuidStrKeyTrait;
 
     /** @var array<int, string> The attributes that are mass assignable */
     protected $fillable = [
         'name',
         'user_id',
         'device_id',
         'notification_token',
         'mfa_enabled',
     ];
 
     /**
      * Send a notification via firebase.
      *
      * @param array $deviceIds A list of device id's to send the notification to
      * @param array $data      The data to include in the notification.
      *
      * @throws \Exception on notification failure
      * @return bool true if a notification has been sent
      */
     private static function pushFirebaseNotification($deviceIds, $data): bool
     {
         \Log::debug("sending notification to " . var_export($deviceIds, true));
+
         $apiKey = \config('firebase.api_key');
+        $apiUrl = \config('firebase.api_url');
+        $verify = \config('firebase.api_verify_tls');
 
-        $client = new \GuzzleHttp\Client(
-            [
-                'verify' => \config('firebase.api_verify_tls')
-            ]
-        );
-        $response = $client->request(
-            'POST',
-            \config('firebase.api_url'),
-            [
-                'headers' => [
-                        'Authorization' => "key={$apiKey}",
-                ],
-                'json' => [
-                    'registration_ids' => $deviceIds,
-                    'data' => $data
-                ]
-            ]
-        );
+        if (empty($apiKey)) {
+            return false;
+        }
 
+        Http::withOptions(['verify' => $verify])
+            ->withHeaders(['Authorization' => "key={$apiKey}"])
+            ->timeout(5)
+            ->connectTimeout(5)
+            ->post($apiUrl, ['registration_ids' => $deviceIds, 'data' => $data])
+            ->throwUnlessStatus(200);
 
-        if ($response->getStatusCode() != 200) {
-            throw new \Exception('FCM Send Error: ' . $response->getStatusCode());
-        }
         return true;
     }
 
     /**
      * Send a notification to a user.
      *
      * @throws \Exception on notification failure
      * @return bool true if a notification has been sent
      */
     public static function notifyUser($userId, $data): bool
     {
         $notificationTokens = CompanionApp::where('user_id', $userId)
             ->where('mfa_enabled', true)
             ->pluck('notification_token')
             ->all();
 
         if (empty($notificationTokens)) {
             \Log::debug("There is no 2fa device to notify.");
             return false;
         }
 
-        self::pushFirebaseNotification($notificationTokens, $data);
-        return true;
+        return self::pushFirebaseNotification($notificationTokens, $data);
     }
 
     /**
      * Returns whether this companion app is paired with a device.
      *
      * @return bool
      */
     public function isPaired(): bool
     {
         return !empty($this->device_id);
     }
 
     /**
      * The PassportClient of this CompanionApp
      *
      * @return \App\Auth\PassportClient|null
      */
     public function passportClient()
     {
         return \App\Auth\PassportClient::find($this->oauth_client_id);
     }
 
     /**
      * Set the PassportClient of this CompanionApp
      *
      * @param \Laravel\Passport\Client $client The client object
      */
     public function setPassportClient(\Laravel\Passport\Client $client)
     {
         return $this->oauth_client_id = $client->id;
     }
 }