diff --git a/src/newsreader/js/pages/homepage/App.js b/src/newsreader/js/pages/homepage/App.js
index b66d256..da76ef7 100644
--- a/src/newsreader/js/pages/homepage/App.js
+++ b/src/newsreader/js/pages/homepage/App.js
@@ -40,6 +40,7 @@ class App extends React.Component {
             timelineUrl={this.props.timelineUrl}
             categoriesUrl={this.props.categoriesUrl}
             timezone={this.props.timezone}
+            autoMarking={this.props.autoMarking}
           />
         )}
       </>
diff --git a/src/newsreader/js/pages/homepage/components/PostModal.js b/src/newsreader/js/pages/homepage/components/PostModal.js
index 09867c9..91017dd 100644
--- a/src/newsreader/js/pages/homepage/components/PostModal.js
+++ b/src/newsreader/js/pages/homepage/components/PostModal.js
@@ -21,8 +21,7 @@ class PostModal extends React.Component {
     const markPostRead = this.props.markPostRead;
     const token = Cookies.get('csrftoken');
 
-    // TODO set timer depending on user setting
-    if (!post.read) {
+    if (this.props.autoMarking && !post.read) {
       this.readTimer = setTimeout(markPostRead, 3000, post, token);
     }
 
diff --git a/src/newsreader/js/pages/homepage/index.js b/src/newsreader/js/pages/homepage/index.js
index 5279482..645592d 100644
--- a/src/newsreader/js/pages/homepage/index.js
+++ b/src/newsreader/js/pages/homepage/index.js
@@ -22,6 +22,7 @@ if (page) {
         timelineUrl={timelineUrl.substring(1, timelineUrl.length - 4)}
         categoriesUrl={categoriesUrl.substring(1, categoriesUrl.length - 4)}
         timezone={settings.timezone}
+        autoMarking={settings.autoMarking}
       />
     </Provider>,
     page