diff --git a/app/Handlers/Commands/Component/AddComponentCommandHandler.php b/app/Handlers/Commands/Component/AddComponentCommandHandler.php
index 11fd1c0c..61662443 100644
--- a/app/Handlers/Commands/Component/AddComponentCommandHandler.php
+++ b/app/Handlers/Commands/Component/AddComponentCommandHandler.php
@@ -42,7 +42,7 @@ class AddComponentCommandHandler
      */
     protected function filter(AddComponentCommand $command)
     {
-        return array_filter([
+        $params = [
             'name'        => $command->name,
             'description' => $command->description,
             'link'        => $command->link,
@@ -50,6 +50,10 @@ class AddComponentCommandHandler
             'enabled'     => $command->enabled,
             'order'       => $command->order,
             'group_id'    => $command->group_id,
-        ], 'is_null');
+        ];
+
+        return array_filter($params, function ($val) {
+            return $val !== null;
+        });
     }
 }
diff --git a/app/Handlers/Commands/Component/UpdateComponentCommandHandler.php b/app/Handlers/Commands/Component/UpdateComponentCommandHandler.php
index 1e42c81b..56b4b429 100644
--- a/app/Handlers/Commands/Component/UpdateComponentCommandHandler.php
+++ b/app/Handlers/Commands/Component/UpdateComponentCommandHandler.php
@@ -44,7 +44,7 @@ class UpdateComponentCommandHandler
      */
     protected function filter(UpdateComponentCommand $command)
     {
-        return array_filter([
+        $params = [
             'name'        => $command->name,
             'description' => $command->description,
             'link'        => $command->link,
@@ -52,6 +52,10 @@ class UpdateComponentCommandHandler
             'enabled'     => $command->enabled,
             'order'       => $command->order,
             'group_id'    => $command->group_id,
-        ], 'is_null');
+        ];
+
+        return array_filter($params, function ($val) {
+            return $val !== null;
+        });
     }
 }
diff --git a/app/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php b/app/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php
index c2ce129b..4fea16bf 100644
--- a/app/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php
+++ b/app/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php
@@ -88,7 +88,7 @@ class UpdateIncidentCommandHandler
      */
     protected function filter(UpdateIncidentCommand $command)
     {
-        return array_filter([
+        $params = [
             'name'             => $command->name,
             'status'           => $command->status,
             'message'          => $command->message,
@@ -96,7 +96,11 @@ class UpdateIncidentCommandHandler
             'component_id'     => $command->component_id,
             'component_status' => $command->component_status,
             'notify'           => $command->notify,
-        ], 'is_null');
+        ];
+
+        return array_filter($params, function ($val) {
+            return $val !== null;
+        });
     }
 
     /**
diff --git a/app/Handlers/Commands/Metric/UpdateMetricCommandHandler.php b/app/Handlers/Commands/Metric/UpdateMetricCommandHandler.php
index ff54f992..c4e94b0b 100644
--- a/app/Handlers/Commands/Metric/UpdateMetricCommandHandler.php
+++ b/app/Handlers/Commands/Metric/UpdateMetricCommandHandler.php
@@ -44,7 +44,7 @@ class UpdateMetricCommandHandler
      */
     protected function filter(UpdateMetricCommand $command)
     {
-        return array_filter([
+        $params = [
             'name'          => $command->name,
             'suffix'        => $command->suffix,
             'description'   => $command->description,
@@ -52,6 +52,10 @@ class UpdateMetricCommandHandler
             'calc_type'     => $command->calc_type,
             'display_chart' => $command->display_chart,
             'places'        => $command->places,
-        ], 'is_null');
+        ];
+
+        return array_filter($params, function ($val) {
+            return $val !== null;
+        });
     }
 }