diff --git a/jOOQ-examples/jOOQ-oracle-example/src/main/resources/config.properties b/jOOQ-examples/jOOQ-oracle-example/src/main/resources/config.properties
index 4a8ea45158..39224bb15f 100644
--- a/jOOQ-examples/jOOQ-oracle-example/src/main/resources/config.properties
+++ b/jOOQ-examples/jOOQ-oracle-example/src/main/resources/config.properties
@@ -1,6 +1,6 @@
 #Database Configuration
 db.driver=oracle.jdbc.OracleDriver
-db.url=jdbc:oracle:thin:@localhost:1521:ORCLCDB
+db.url=jdbc:oracle:thin:@localhost:1521:xe
 db.username=SP
 db.password=SP
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index cdd682f284..e15d52554e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -8152,11 +8152,10 @@ final class ParserImpl implements Parser {
         if (parseFunctionNameIf(ctx, "ISNULL")) {
             parse(ctx, '(');
             Field<?> f1 = parseField(ctx);
-            parse(ctx, ',');
-            Field<?> f2 = parseField(ctx);
+            Field<?> f2 = parseIf(ctx, ',') ? parseField(ctx) : null;
             parse(ctx, ')');
 
-            return isnull(f1, f2);
+            return f2 != null ? isnull(f1, f2) : field(f1.isNull());
         }
 
         return null;