diff --git a/ChattoApp/ChattoApp/Source/ChatItemsDemoDecorator.swift b/ChattoApp/ChattoApp/Source/ChatItemsDemoDecorator.swift
index 0779baef2..4db647efb 100644
--- a/ChattoApp/ChattoApp/Source/ChatItemsDemoDecorator.swift
+++ b/ChattoApp/ChattoApp/Source/ChatItemsDemoDecorator.swift
@@ -54,7 +54,7 @@ final class ChatItemsDemoDecorator: ChatItemsDecoratorProtocol {
                 }
 
                 if let previousMessage = prev as? MessageModelProtocol {
-                    addTimeSeparator = calendar.compare(currentMessage.date, to: previousMessage.date, toGranularity: Calendar.Component.day) != ComparisonResult.orderedSame
+                    addTimeSeparator = !calendar.isDate(currentMessage.date, inSameDayAs: previousMessage.date)
                 } else {
                     addTimeSeparator = true
                 }