diff --git a/server/core/poll.c b/server/core/poll.c
index b3a0e6b70..ff8cfe7b3 100644
--- a/server/core/poll.c
+++ b/server/core/poll.c
@@ -620,7 +620,15 @@ DCB                *zombies = NULL;
                                                 eno,
                                                 strerror(eno))));
                                         atomic_add(&pollStats.n_hup, 1);
-					dcb->func.hangup(dcb);
+					spinlock_acquire(&dcb->dcb_initlock);
+					if ((dcb->flags & DCBF_HUNG) == 0)
+					{
+						dcb->flags |= DCBF_HUNG;
+						spinlock_release(&dcb->dcb_initlock);
+						dcb->func.hangup(dcb);
+					}
+					else
+						spinlock_release(&dcb->dcb_initlock);
 				}
 
 				if (ev & EPOLLRDHUP)
@@ -639,7 +647,15 @@ DCB                *zombies = NULL;
                                                 eno,
                                                 strerror(eno))));
                                         atomic_add(&pollStats.n_hup, 1);
-					dcb->func.hangup(dcb);
+					spinlock_acquire(&dcb->dcb_initlock);
+					if ((dcb->flags & DCBF_HUNG) == 0)
+					{
+						dcb->flags |= DCBF_HUNG;
+						spinlock_release(&dcb->dcb_initlock);
+						dcb->func.hangup(dcb);
+					}
+					else
+						spinlock_release(&dcb->dcb_initlock);
 				}
 			} /*< for */
                         no_op = FALSE;
diff --git a/server/include/dcb.h b/server/include/dcb.h
index 3966dfead..06687f349 100644
--- a/server/include/dcb.h
+++ b/server/include/dcb.h
@@ -317,6 +317,9 @@ void dcb_call_foreach (DCB_REASON reason);
 void dcb_call_foreach (
         DCB_REASON reason);
 
-/* DCB flags values */
-#define	DCBF_CLONE		0x0001	/* DCB is a clone */
+/**
+ * DCB flags values
+ */
+#define	DCBF_CLONE		0x0001	/*< DCB is a clone */
+#define DCBF_HUNG		0x0002	/*< Hangup has been dispatched */
 #endif /*  _DCB_H */