diff --git a/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php b/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
index db300db..8d37cd8 100644
--- a/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
+++ b/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
@@ -322,10 +322,17 @@ protected function alterSubqueryCondition(AlterableInterface $query, &$condition
   /**
    * Helper function to namespace query pieces.
    *
-   * Turns 'foo.bar' into 'foo_NAMESPACE.bar'.
+   * Turns 'foo.bar' into '"foo_NAMESPACE".bar'.
    */
   protected function conditionNamespace($string) {
-    return str_replace('.', $this->subquery_namespace . '.', $string);
+    $parts = explode(' = ', $string);
+    foreach ($parts as &$part) {
+      if (strpos($part, '.') !== FALSE) {
+        $part = '"' . str_replace('.', $this->subquery_namespace . '".', $part);
+      }
+    }
+
+    return implode(' = ', $parts);
   }

   /**