diff --git a/app/src/main/java/com/kunzisoft/keepass/view/TemplateView.kt b/app/src/main/java/com/kunzisoft/keepass/view/TemplateView.kt
index 0ed140f7c..81879a8d4 100644
--- a/app/src/main/java/com/kunzisoft/keepass/view/TemplateView.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/TemplateView.kt
@@ -119,8 +119,8 @@ class TemplateView @JvmOverloads constructor(context: Context,
 
         // Hide empty custom fields
         emptyCustomFields.forEach { customFieldId ->
-            templateContainerView.findViewById<View>(customFieldId.viewId)
-                .isVisible = false
+            templateContainerView.findViewById<View?>(customFieldId.viewId)
+                ?.isVisible = false
         }
 
         mEntryInfo?.let { entryInfo ->