diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java
index b45c139bc..5ecf7ab59 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java
@@ -261,12 +261,14 @@ public class FormField implements NamedElement {
      */
     public String getFirstValue() {
         CharSequence firstValue;
+
         synchronized (values) {
+            if (values.isEmpty()) {
+                return null;
+            }
             firstValue = values.get(0);
         }
-        if (firstValue == null) {
-            return null;
-        }
+
         return firstValue.toString();
     }