diff --git a/Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerView.swift b/Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerView.swift
index f2f68fb7..2d8f2dfc 100644
--- a/Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerView.swift
+++ b/Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerView.swift
@@ -388,7 +388,7 @@ public struct ComposerInputView<Factory: ViewFactory>: View, KeyboardReadable {
         .background(composerInputBackground)
         .overlay(
             RoundedRectangle(cornerRadius: TextSizeConstants.cornerRadius)
-                .stroke(Color(keyboardShown ? colors.composerInputHighlightedBorder : colors.innerBorder))
+                .stroke(Color(keyboardShown ? highlightedBorder : colors.innerBorder))
         )
         .clipShape(
             RoundedRectangle(cornerRadius: TextSizeConstants.cornerRadius)
@@ -403,6 +403,11 @@ public struct ComposerInputView<Factory: ViewFactory>: View, KeyboardReadable {
         var colors = colors
         return Color(colors.composerInputBackground)
     }
+    
+    private var highlightedBorder: UIColor {
+        var colors = colors
+        return colors.composerInputHighlightedBorder
+    }
 
     private var shouldAddVerticalPadding: Bool {
         !addedFileURLs.isEmpty || !addedAssets.isEmpty
diff --git a/Sources/StreamChatSwiftUI/ColorPalette.swift b/Sources/StreamChatSwiftUI/ColorPalette.swift
index 96365084..00b9bb7a 100644
--- a/Sources/StreamChatSwiftUI/ColorPalette.swift
+++ b/Sources/StreamChatSwiftUI/ColorPalette.swift
@@ -84,7 +84,7 @@ public struct ColorPalette {
 
     public lazy var composerPlaceholderColor: UIColor = subtitleText
     public lazy var composerInputBackground: UIColor = background
-    public var composerInputHighlightedBorder: UIColor = .streamInnerBorder
+    public lazy var composerInputHighlightedBorder: UIColor = innerBorder
 }
 
 // Those colors are default defined stream constants, which are fallback values if you don't implement your color theme.