diff --git a/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api.js b/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api.js
index 81e5371..d33ed23 100644
--- a/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api.js
+++ b/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api.js
@@ -51,11 +51,7 @@
           .then(comments => { this._comments = comments; }));
       promises.push(this.$.restAPI.getDiffRobotComments(changeNum)
           .then(robotComments => { this._robotComments = robotComments; }));
-      promises.push(this.$.restAPI.getLoggedIn()
-          .then(loggedIn => {
-            if (!loggedIn) { return Promise.resolve({}); }
-            return this.$.restAPI.getDiffDrafts(changeNum);
-          })
+      promises.push(this.$.restAPI.getDiffDrafts(changeNum)
           .then(drafts => { this._drafts = drafts; }));
 
       return Promise.all(promises);
diff --git a/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api_test.html b/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api_test.html
index 1fdc872..09403a4 100644
--- a/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api_test.html
+++ b/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api_test.html
@@ -57,14 +57,16 @@
           }));
       sandbox.stub(element.$.restAPI, 'getDiffRobotComments')
           .returns(Promise.resolve({'foo.c': [{id: '321', message: 'done'}]}));
-      sandbox.stub(element.$.restAPI, 'getDiffDrafts');
+      sandbox.stub(element.$.restAPI, 'getDiffDrafts')
+          .returns(Promise.resolve({}));
 
       return element.loadAll(changeNum).then(() => {
         assert.isTrue(element.$.restAPI.getDiffComments.calledWithExactly(
             changeNum));
         assert.isTrue(element.$.restAPI.getDiffRobotComments.calledWithExactly(
             changeNum));
-        assert.isFalse(element.$.restAPI.getDiffDrafts.called);
+        assert.isTrue(element.$.restAPI.getDiffDrafts.calledWithExactly(
+            changeNum));
         assert.isOk(element._comments);
         assert.isOk(element._robotComments);
         assert.deepEqual(element._drafts, {});
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
index e4901f5..8655aa0 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
@@ -730,10 +730,7 @@
     },
 
     _getDiffDrafts() {
-      return this._getLoggedIn().then(loggedIn => {
-        if (!loggedIn) { return Promise.resolve({}); }
-        return this.$.restAPI.getDiffDrafts(this._changeNum);
-      });
+      return this.$.restAPI.getDiffDrafts(this._changeNum);
     },
 
     _computeCommentSkips(commentMap, fileList, path) {
