diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index d7689752f..978cc8cb9 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -117,7 +117,9 @@ class FreshRSS_ConfigurationSetter {
 	private function _queries(&$data, $values) {
 		$data['queries'] = array();
 		foreach ($values as $value) {
-			$data['queries'][] = $value->toArray();
+			if ($value != null) {
+				$data['queries'][] = $value->toArray();
+			}
 		}
 	}