diff --git a/app/Filters/TaskFilters.php b/app/Filters/TaskFilters.php
index bae9ab882bb0..3356c538e08f 100644
--- a/app/Filters/TaskFilters.php
+++ b/app/Filters/TaskFilters.php
@@ -150,6 +150,19 @@ class TaskFilters extends QueryFilters
         return $this->builder->orderBy($sort_col[0], $dir);
     }
 
+    public function user_id(string $user = ''): Builder
+    {
+        if (strlen($user) == 0) {
+            return $this->builder;
+        }
+
+        return $this->builder->where(function ($query) use ($user) {
+            $query->where('user_id', $this->decodePrimaryKey($user))
+                  ->orWhere('assigned_user_id', $this->decodePrimaryKey($user));
+        });
+
+    }
+
     public function task_status(string $value = ''): Builder
     {
         if (strlen($value) == 0) {
diff --git a/app/Utils/Traits/SubscriptionHooker.php b/app/Utils/Traits/SubscriptionHooker.php
index ee286a949423..fdacaca9dc26 100644
--- a/app/Utils/Traits/SubscriptionHooker.php
+++ b/app/Utils/Traits/SubscriptionHooker.php
@@ -48,7 +48,11 @@ trait SubscriptionHooker
                 RequestOptions::JSON => ['body' => $body], RequestOptions::ALLOW_REDIRECTS => false,
             ]);
 
-            return array_merge($body, json_decode($response->getBody(), true));
+            if($response_body = json_decode($response->getBody(), true))
+                return array_merge($body, $response_body);
+
+            return array_merge($body, ['message' => 'Success', 'status_code' => 200]);
+
         } catch (ClientException $e) {
             $message = $e->getMessage();