diff --git a/core/modules/views/src/ManyToOneHelper.php b/core/modules/views/src/ManyToOneHelper.php
index cb2e5754..2d0bb11e 100644
--- a/core/modules/views/src/ManyToOneHelper.php
+++ b/core/modules/views/src/ManyToOneHelper.php
@@ -264,7 +264,11 @@ public function addFilter() {
     $options = $this->handler->options;
     $operator = $this->handler->operator;
     $formula = !empty($this->formula);
-    $value = $this->handler->value;
+    if (isset($options['is_grouped']) && $options['is_grouped'] && isset($this->handler->group_info)) {
+      $value = $this->handler->group_info;
+    } else {
+      $value = $this->handler->value;
+    }
     if (empty($options['group'])) {
       $options['group'] = 0;
     }
@@ -304,7 +308,7 @@ public function addFilter() {
       }
       else {
         $placeholder = $this->placeholder();
-        if (count($this->handler->value) > 1) {
+        if (is_countable($value) && count($value) > 1) {
           $placeholder .= '[]';

           if ($operator == 'IS NULL') {