diff --git a/compiled_starters/haskell/app/Main.hs b/compiled_starters/haskell/app/Main.hs
index 62ed202..12ae2c0 100644
--- a/compiled_starters/haskell/app/Main.hs
+++ b/compiled_starters/haskell/app/Main.hs
@@ -5,11 +5,13 @@ module Main (main) where
 import Control.Monad (forever)
 import qualified Data.ByteString.Char8 as BC
 import Network.Socket
-import System.IO (BufferMode (..), hSetBuffering, stdout)
+import System.IO (BufferMode (NoBuffering), hSetBuffering, stdout, stderr)
 
 main :: IO ()
 main = do
-    hSetBuffering stdout LineBuffering
+    -- Disable output buffering
+    hSetBuffering stdout NoBuffering
+    hSetBuffering stderr NoBuffering
 
     -- You can use print statements as follows for debugging, they'll be visible when running tests.
     BC.putStrLn "Logs from your program will appear here"
diff --git a/solutions/haskell/01-at4/code/app/Main.hs b/solutions/haskell/01-at4/code/app/Main.hs
index 896c502..de2a4c9 100644
--- a/solutions/haskell/01-at4/code/app/Main.hs
+++ b/solutions/haskell/01-at4/code/app/Main.hs
@@ -5,11 +5,13 @@ module Main (main) where
 import Control.Monad (forever)
 import qualified Data.ByteString.Char8 as BC
 import Network.Socket
-import System.IO (BufferMode (..), hSetBuffering, stdout)
+import System.IO (BufferMode (NoBuffering), hSetBuffering, stdout, stderr)
 
 main :: IO ()
 main = do
-    hSetBuffering stdout LineBuffering
+    -- Disable output buffering
+    hSetBuffering stdout NoBuffering
+    hSetBuffering stderr NoBuffering
 
     let host = "127.0.0.1"
         port = "4221"
diff --git a/solutions/haskell/01-at4/diff/app/Main.hs.diff b/solutions/haskell/01-at4/diff/app/Main.hs.diff
index 446e482..faa2ad3 100644
--- a/solutions/haskell/01-at4/diff/app/Main.hs.diff
+++ b/solutions/haskell/01-at4/diff/app/Main.hs.diff
@@ -1,4 +1,4 @@
-@@ -1,36 +1,32 @@
+@@ -1,38 +1,34 @@
  {-# LANGUAGE OverloadedStrings #-}
 
  module Main (main) where
@@ -6,11 +6,13 @@
  import Control.Monad (forever)
  import qualified Data.ByteString.Char8 as BC
  import Network.Socket
- import System.IO (BufferMode (..), hSetBuffering, stdout)
+ import System.IO (BufferMode (NoBuffering), hSetBuffering, stdout, stderr)
 
  main :: IO ()
  main = do
-     hSetBuffering stdout LineBuffering
+     -- Disable output buffering
+     hSetBuffering stdout NoBuffering
+     hSetBuffering stderr NoBuffering
 
 -    -- You can use print statements as follows for debugging, they'll be visible when running tests.
 -    BC.putStrLn "Logs from your program will appear here"
diff --git a/starter_templates/haskell/code/app/Main.hs b/starter_templates/haskell/code/app/Main.hs
index 62ed202..12ae2c0 100644
--- a/starter_templates/haskell/code/app/Main.hs
+++ b/starter_templates/haskell/code/app/Main.hs
@@ -5,11 +5,13 @@ module Main (main) where
 import Control.Monad (forever)
 import qualified Data.ByteString.Char8 as BC
 import Network.Socket
-import System.IO (BufferMode (..), hSetBuffering, stdout)
+import System.IO (BufferMode (NoBuffering), hSetBuffering, stdout, stderr)
 
 main :: IO ()
 main = do
-    hSetBuffering stdout LineBuffering
+    -- Disable output buffering
+    hSetBuffering stdout NoBuffering
+    hSetBuffering stderr NoBuffering
 
     -- You can use print statements as follows for debugging, they'll be visible when running tests.
     BC.putStrLn "Logs from your program will appear here"