diff --git a/chrome/content/zotero/xpcom/reader.js b/chrome/content/zotero/xpcom/reader.js
index 6498c88deb..c11110d722 100644
--- a/chrome/content/zotero/xpcom/reader.js
+++ b/chrome/content/zotero/xpcom/reader.js
@@ -655,7 +655,10 @@ class ReaderInstance {
 			if (this._type === 'pdf') {
 				item.setAttachmentLastPageIndex(state.pageIndex);
 			}
-			// epub, snapshot
+			else if (this._type === 'epub') {
+				item.setAttachmentLastPageIndex(state.cfi);
+			}
+			// snapshot
 			else {
 				// setAttachmentSomeProperty(state.someProperty);
 			}
@@ -712,7 +715,17 @@ class ReaderInstance {
 				return { pageIndex };
 			}
 		}
-		// epub, snapshot
+		else if (this._type === 'epub') {
+			let cfi = item.getAttachmentLastPageIndex();
+			if (state) {
+				state.cfi = cfi;
+				return state;
+			}
+			else {
+				return { cfi };
+			}
+		}
+		// snapshot
 		else {
 			// let someProperty = item.getAttachmentSomeProperty();
 			// if (state) {
diff --git a/pdf-reader b/pdf-reader
index 247e7b5cfd..4d67421561 160000
--- a/pdf-reader
+++ b/pdf-reader
@@ -1 +1 @@
-Subproject commit 247e7b5cfd1e67db503a634556d5fcb57312d3d6
+Subproject commit 4d674215617933746c8d5b3fce2cc85b67e3006e