diff --git a/app/Http/Middleware/ParsePostRequestFields.php b/app/Http/Middleware/ParsePostRequestFields.php
index ce8e3a0b41..8f64ed8a8d 100644
--- a/app/Http/Middleware/ParsePostRequestFields.php
+++ b/app/Http/Middleware/ParsePostRequestFields.php
@@ -34,7 +34,9 @@ public function handle(Request $request, Closure $next) {
                     }
 
                     // Decode HTML special chars
-                    $parsedFields[$key] = htmlspecialchars_decode($parsedFields[$key]);
+                    if ($parsedFields[$key] != null) {
+                        $parsedFields[$key] = htmlspecialchars_decode($parsedFields[$key]);
+                    }
                 }
             }
 
@@ -63,7 +65,9 @@ private function parseArray(array $array, array $strippedFields): array {
                 }
 
                 // Decode HTML special chars
-                $array[$key] = htmlspecialchars_decode($array[$key]);
+                if ($array[$key] != null) {
+                    $array[$key] = htmlspecialchars_decode($array[$key]);
+                }
             }
         }