diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Stories/StoriesController.java b/TMessagesProj/src/main/java/org/telegram/ui/Stories/StoriesController.java
index 0ac7dba5d1..04c41b2b49 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Stories/StoriesController.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Stories/StoriesController.java
@@ -1394,6 +1394,7 @@ public int hasUnreadStoriesLive(long dialogId) {
     }
 
     public boolean hasLiveStory(long dialogId) {
+        if (NaConfig.INSTANCE.getDisableStories().Bool()) return false;
         TL_stories.PeerStories userStories = allStoriesMap.get(dialogId);
         if (userStories == null) {
             userStories = getStoriesFromFullPeer(dialogId);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Stories/StoriesUtilities.java b/TMessagesProj/src/main/java/org/telegram/ui/Stories/StoriesUtilities.java
index 5bffd7158b..fa37bf76ee 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Stories/StoriesUtilities.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Stories/StoriesUtilities.java
@@ -165,6 +165,10 @@ public static void drawAvatarWithStory(long dialogId, Canvas canvas, ImageReceiv
             unreadState = state = params.forceState;
         }
 
+        if (NaConfig.INSTANCE.getDisableStories().Bool()) {
+            unreadState = state = STATE_EMPTY;
+        }
+
         if (params.currentState != state) {
             if (params.currentState == STATE_PROGRESS) {
                 animated = true;