Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc37bbcec1cc4b57115b1d1cefe9b6fe7c4ea357a
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision c37bbcec1cc4b57115b1d1cefe9b6fe7c4ea357a)
@@ -974,15 +974,18 @@
 	    }
 	}
 
-	ImageGalleryUser user = imageGalleryUserDao.getUserByUserIDAndContentID(userId.longValue(), toolContentId);
-	if (user != null) {
-	    NotebookEntry entry = getEntry(user.getSession().getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL,
-		    ImageGalleryConstants.TOOL_SIGNATURE, userId);
-	    if (entry != null) {
-		imageGalleryDao.removeObject(NotebookEntry.class, entry.getUid());
-	    }
+	for (ImageGallerySession session : imageGallerySessionDao.getByContentId(toolContentId)) {
+	    ImageGalleryUser user = imageGalleryUserDao.getUserByUserIDAndSessionID(userId.longValue(),
+		    session.getSessionId());
+	    if (user != null) {
+		NotebookEntry entry = getEntry(user.getSession().getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL,
+			ImageGalleryConstants.TOOL_SIGNATURE, userId);
+		if (entry != null) {
+		    imageGalleryDao.removeObject(NotebookEntry.class, entry.getUid());
+		}
 
-	    imageGalleryUserDao.removeObject(ImageGalleryUser.class, user.getUid());
+		imageGalleryUserDao.removeObject(ImageGalleryUser.class, user.getUid());
+	    }
 	}
 
     }