diff --git a/db-service/lib/cqn2sql.js b/db-service/lib/cqn2sql.js
index 2db22e7e1..151ff087d 100644
--- a/db-service/lib/cqn2sql.js
+++ b/db-service/lib/cqn2sql.js
@@ -479,10 +479,11 @@ class CQN2SQLRenderer {
 
           buffer += '"'
         } else {
+          if (val === undefined) continue
           if (elements[key]?.type in BINARY_TYPES) {
             val = transformBase64(val)
           }
-          buffer += `${keyJSON}${val === undefined ? 'null' : JSON.stringify(val)}`
+          buffer += `${keyJSON}${JSON.stringify(val)}`
         }
       }
       buffer += '}'
diff --git a/test/compliance/resources/db/basic/literals/basic.literals.string.js b/test/compliance/resources/db/basic/literals/basic.literals.string.js
index 0888d5264..227bb933f 100644
--- a/test/compliance/resources/db/basic/literals/basic.literals.string.js
+++ b/test/compliance/resources/db/basic/literals/basic.literals.string.js
@@ -11,6 +11,20 @@ module.exports = [
     large: null,
     blob: null,
   },
+  {
+    string: undefined,
+    char: undefined,
+    short: undefined,
+    medium: undefined,
+    large: undefined,
+    blob: undefined,
+    '=string': null,
+    '=char': null,
+    '=short': null,
+    '=medium': null,
+    '=large': null,
+    '=blob': null,
+  },
   {
     string: 'Simple String',
   },