diff --git a/jOOQ/src/main/java/org/jooq/impl/Diff.java b/jOOQ/src/main/java/org/jooq/impl/Diff.java
index d5983c1e8b..4faa1e7ee5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Diff.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Diff.java
@@ -310,7 +310,8 @@ final class Diff {
 
             if (v1 && v2) {
                 if (!Arrays.equals(t1.fields(), t2.fields())
-                    || !t1.getOptions().select().equals(t2.getOptions().select())) {
+                      || t2.getOptions().select() != null && !t2.getOptions().select().equals(t1.getOptions().select())
+                      || t2.getOptions().source() != null && !t2.getOptions().source().equals(t1.getOptions().source())) {
                     replaceView(r, t1, t2);
                     return;
                 }