diff --git a/app/src/main/java/androidx/sqlite/db/SupportSQLiteCompat.kt b/app/src/main/java/androidx/sqlite/db/SupportSQLiteCompat.kt
index 36c2f875fa..e1af305072 100644
--- a/app/src/main/java/androidx/sqlite/db/SupportSQLiteCompat.kt
+++ b/app/src/main/java/androidx/sqlite/db/SupportSQLiteCompat.kt
@@ -106,7 +106,7 @@ class SupportSQLiteCompat private constructor() {
             cursorFactory: CursorFactory
         ): Cursor {
             return sQLiteDatabase.rawQueryWithFactory(
-                cursorFactory, sql, selectionArgs, editTable,
+                cursorFactory, sql, selectionArgs, editTable ?: "",
                 cancellationSignal
             )
         }
diff --git a/app/src/main/java/androidx/sqlite/db/framework/FrameworkSQLiteDatabase.kt b/app/src/main/java/androidx/sqlite/db/framework/FrameworkSQLiteDatabase.kt
index 886f90b8df..589a3395a1 100644
--- a/app/src/main/java/androidx/sqlite/db/framework/FrameworkSQLiteDatabase.kt
+++ b/app/src/main/java/androidx/sqlite/db/framework/FrameworkSQLiteDatabase.kt
@@ -154,7 +154,7 @@ internal class FrameworkSQLiteDatabase(
         }
 
         return delegate.rawQueryWithFactory(
-            cursorFactory, query.sql, EMPTY_STRING_ARRAY, null)
+            cursorFactory, query.sql, EMPTY_STRING_ARRAY, "")
     }
 
     @RequiresApi(16)