diff --git a/Stepic/DiscussionsViewController.swift b/Stepic/DiscussionsViewController.swift
index 3a46b2794d..9f7ccd4e1b 100644
--- a/Stepic/DiscussionsViewController.swift
+++ b/Stepic/DiscussionsViewController.swift
@@ -42,7 +42,9 @@ class DiscussionsViewController: UIViewController {
 
     var discussionProxyId: String!
     var target: Int!
-    var step: Step!
+
+    // This var is used only for incrementing discussions count
+    var step: Step?
 
     @IBOutlet weak var tableView: UITableView!
 
@@ -725,7 +727,7 @@ extension DiscussionsViewController : WriteCommentDelegate {
             discussionIds.loaded.insert(comment.id, at: 0)
             discussions.insert(comment, at: 0)
             reloadTableData()
-            step.discussionsCount? += 1
+            step?.discussionsCount? += 1
         }
     }
 }
diff --git a/Stepic/VideoStepViewController.swift b/Stepic/VideoStepViewController.swift
index ab8cea1dbc..6f5812e6ff 100644
--- a/Stepic/VideoStepViewController.swift
+++ b/Stepic/VideoStepViewController.swift
@@ -165,6 +165,10 @@ class VideoStepViewController: UIViewController {
         let downloadItem = UIBarButtonItem(customView: itemView)
         let shareBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.action, target: self, action: #selector(VideoStepViewController.sharePressed(_:)))
         nItem.rightBarButtonItems = [shareBarButtonItem, downloadItem]
+
+        if let discussionCount = step.discussionsCount {
+            discussionCountView.commentsCount = discussionCount
+        }
     }
 
     override func didReceiveMemoryWarning() {
@@ -253,6 +257,7 @@ class VideoStepViewController: UIViewController {
             let vc = DiscussionsViewController(nibName: "DiscussionsViewController", bundle: nil)
             vc.discussionProxyId = discussionProxyId
             vc.target = self.step.id
+            vc.step = self.step
             nController?.pushViewController(vc, animated: true)
         } else {
             //TODO: Load comments here