diff --git a/src/libvncserver/rfbserver.c b/src/libvncserver/rfbserver.c
index ccc09a77..a2b98a00 100644
--- a/src/libvncserver/rfbserver.c
+++ b/src/libvncserver/rfbserver.c
@@ -197,6 +197,8 @@ rfbClientIteratorHead(rfbClientIteratorPtr i)
     rfbDecrClientRef(i->next);
     rfbIncrClientRef(i->screen->clientHead);
   }
+  else if(i->screen->clientHead != 0)
+    rfbIncrClientRef(i->screen->clientHead);
 #endif
   LOCK(rfbClientListMutex);
   i->next = i->screen->clientHead;