diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 71d432e41..f86bab3c9 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -894,7 +894,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements DraggableLi
             view.setTag(viewHolder);
         } else {
             viewHolder = (ViewHolder) view.getTag();
-            if (dragHelper.getCapturedView() == view) {
+            if (dragHelper != null && dragHelper.getCapturedView() == view) {
                 dragHelper.abort();
             }