diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostRepository.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostRepository.kt
index a8ed279ab6bc..f89770ccedee 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostRepository.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostRepository.kt
@@ -75,7 +75,7 @@ class EditPostRepository
     val status: PostStatus
         get() = fromPost(getPost())
     val isPage: Boolean
-        get() = post!!.isPage
+        get() = post?.isPage == true
     val isLocalDraft: Boolean
         get() = post!!.isLocalDraft
     val isLocallyChanged: Boolean