diff --git a/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainNavFragmentViewModelX.kt b/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainNavFragmentViewModelX.kt
index 682510e1..f7f03c73 100644
--- a/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainNavFragmentViewModelX.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainNavFragmentViewModelX.kt
@@ -174,7 +174,7 @@ class MainNavFragmentViewModelX(val db: DatabaseX, primarySource: Source, second
     ) :
         ViewModelProvider.Factory {
         @Suppress("unchecked_cast")
-        override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
             if (modelClass.isAssignableFrom(MainNavFragmentViewModelX::class.java)) {
                 return MainNavFragmentViewModelX(db, primarySource, secondarySource) as T
             }
diff --git a/src/main/kotlin/com/looker/droidify/ui/viewmodels/RepositoriesViewModelX.kt b/src/main/kotlin/com/looker/droidify/ui/viewmodels/RepositoriesViewModelX.kt
index ab846412..91bf69b3 100644
--- a/src/main/kotlin/com/looker/droidify/ui/viewmodels/RepositoriesViewModelX.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/viewmodels/RepositoriesViewModelX.kt
@@ -16,7 +16,7 @@ class RepositoriesViewModelX(val db: DatabaseX) : ViewModel() {
 
     class Factory(val db: DatabaseX) : ViewModelProvider.Factory {
         @Suppress("unchecked_cast")
-        override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
             if (modelClass.isAssignableFrom(RepositoriesViewModelX::class.java)) {
                 return RepositoriesViewModelX(db) as T
             }
diff --git a/src/main/kotlin/com/looker/droidify/ui/viewmodels/RepositoryViewModelX.kt b/src/main/kotlin/com/looker/droidify/ui/viewmodels/RepositoryViewModelX.kt
index 9963b735..78a50979 100644
--- a/src/main/kotlin/com/looker/droidify/ui/viewmodels/RepositoryViewModelX.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/viewmodels/RepositoryViewModelX.kt
@@ -36,7 +36,7 @@ class RepositoryViewModelX(val db: DatabaseX, val repositoryId: Long) : ViewMode
 
     class Factory(val db: DatabaseX, val repositoryId: Long) : ViewModelProvider.Factory {
         @Suppress("unchecked_cast")
-        override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
             if (modelClass.isAssignableFrom(RepositoryViewModelX::class.java)) {
                 return RepositoryViewModelX(db, repositoryId) as T
             }