diff --git a/Classes/Endpoint/AbstractEndpoint.php b/Classes/Endpoint/AbstractEndpoint.php
new file mode 100644
index 0000000..d69b432
--- /dev/null
+++ b/Classes/Endpoint/AbstractEndpoint.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Avency\Gitea\Endpoint;
+
+use Avency\Gitea\Client;
+
+/**
+ * Abstract endpoint
+ */
+abstract class AbstractEndpoint implements EndpointInterface
+{
+    /**
+     * @param array $array
+     * @return array
+     */
+    protected function removeNullValues(array $array): array
+    {
+        return array_filter(
+            $array,
+            function($value) {
+                return !is_null($value);
+            }
+        );
+    }
+}
diff --git a/Classes/Endpoint/Miscellaneous.php b/Classes/Endpoint/Miscellaneous.php
index 60f06de..237c1a3 100644
--- a/Classes/Endpoint/Miscellaneous.php
+++ b/Classes/Endpoint/Miscellaneous.php
@@ -9,7 +9,7 @@ use Avency\Gitea\Client;
 /**
  * Miscellaneous endpoint
  */
-class Miscellaneous implements EndpointInterface
+class Miscellaneous extends AbstractEndpoint implements EndpointInterface
 {
     const BASE_URI = 'api/v1';
 
@@ -41,7 +41,7 @@ class Miscellaneous implements EndpointInterface
             'text' => $text,
             'wiki' => $wiki
         ];
-        $options['json'] = array_filter($options['json']);
+        $options['json'] = $this->removeNullValues($options['json']);
 
         $response = $this->client->request(self::BASE_URI . '/markdown', 'POST', $options);
         return (string)$response->getBody();
diff --git a/Classes/Endpoint/Repositories.php b/Classes/Endpoint/Repositories.php
index 1b2b4dd..cf52e67 100644
--- a/Classes/Endpoint/Repositories.php
+++ b/Classes/Endpoint/Repositories.php
@@ -9,7 +9,7 @@ use Avency\Gitea\Client;
 /**
  * Repositories endpoint
  */
-class Repositories implements EndpointInterface
+class Repositories extends AbstractEndpoint implements EndpointInterface
 {
     const BASE_URI = 'api/v1/repos';
 
@@ -79,7 +79,7 @@ class Repositories implements EndpointInterface
             ]
         ];
 
-        $options['json'] = array_filter($options['json']);
+        $options['json'] = $this->removeNullValues($options['json']);
         $response = $this->client->request(self::BASE_URI . '/migrate', 'POST', $options);
         return \GuzzleHttp\json_decode($response->getBody(), true);
     }
@@ -134,7 +134,7 @@ class Repositories implements EndpointInterface
             'sort' => $sort,
             'order' => $order,
         ];
-        $options['query'] = array_filter($options['query']);
+        $options['query'] = $this->removeNullValues($options['query']);
         $response = $this->client->request(self::BASE_URI . '/search', 'GET', $options);
         return \GuzzleHttp\json_decode($response->getBody(), true);
     }