diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 0b4f105c2df524e8af25e5499e8f3b80c3124edf..a6fb44ecb8d8ac0a0de9b5dee87386bd09f1f8fd 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -2427,7 +2427,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                             String fillableFieldType = null;
                             String fillableFieldValue = null;
                             for (eu.siacs.conversations.xmpp.forms.Field field : form.getFields()) {
-                                if (field.getType() != null && !field.getType().equals("hidden") && !field.getType().equals("fixed") && !field.getFieldName().equals("http://jabber.org/protocol/commands#actions")) {
+                                if ((field.getType() == null || (!field.getType().equals("hidden") && !field.getType().equals("fixed"))) && !field.getFieldName().equals("http://jabber.org/protocol/commands#actions")) {
                                     fillableFieldType = field.getType();
                                     fillableFieldValue = field.getValue();
                                     fillableFieldCount++;