diff --git a/Makefile b/Makefile
index 200336c3d..a33b1d6e2 100644
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,7 @@ lint-php-ncversion:
 
 lint-php-phan:
 	# PHAN
-	vendor/bin/phan --allow-polyfill-parser -k tests/phan-config.php --no-progress-bar -m checkstyle | vendor/bin/cs2pr --colorize
+	vendor/bin/phan --allow-polyfill-parser -k tests/phan-config.php --no-progress-bar -m checkstyle | vendor/bin/cs2pr --graceful-warnings --colorize
 
 lint-php-phpcs:
 	# PHP CodeSniffer
diff --git a/src/components/Note.vue b/src/components/Note.vue
index fadf9584f..d01dd3252 100644
--- a/src/components/Note.vue
+++ b/src/components/Note.vue
@@ -242,6 +242,10 @@ export default {
 		},
 
 		refreshNote() {
+			if (this.note.unsaved) {
+				this.startRefreshTimer()
+				return
+			}
 			refreshNote(parseInt(this.noteId), this.etag).then(etag => {
 				if (etag) {
 					this.etag = etag