diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
index e2da8f3..1eba0db 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
@@ -141,17 +141,9 @@ public function sqlFunctionIf($condition, $expr1, $expr2 = NULL) {
    */
   public function sqlFunctionGreatest() {
     $args = func_get_args();
-    foreach ($args as $k => $v) {
-      if (!isset($v)) {
-        unset($args);
-      }
-    }
-    if (count($args)) {
-      return max($args);
-    }
-    else {
-      return NULL;
-    }
+
+    // Return NULL if any value is NULL, otherwise max($args)
+    return !in_array(NULL, $args, TRUE) ? max($args) : NULL;
   }
 
   /**