diff --git a/tool/run/log/amt b/tool/run/log/amt
index 102c48181..8ff3740b7 100644
--- a/tool/run/log/amt
+++ b/tool/run/log/amt
@@ -34,8 +34,22 @@ proc run_log { wait_for_re timeout_value } {
 		return false
 	}
 
+	# Check that SOL is correctly configured if wsman is available
+	if {[have_installed wsman]} {
+		set redir_state [exec wsman get http://intel.com/wbem/wscim/1/amt-schema/1/AMT_RedirectionService -h [power_on_amt_host] -P 16992 -u admin -p [power_on_amt_password]]
+		set redir_state [regexp -inline {ListenerEnabled.*ListenerEnabled} $redir_state]
+
+		if {![regexp {ListenerEnabled>true} $redir_state]} {
+			puts "  Warning: AMT_RedirectionService listener is disabled - serial output will not be available"
+			puts "           Use wsman to enable the listener service, e.g.:"
+			puts "  wsman put http://intel.com/wbem/wscim/1/amt-schema/1/AMT_RedirectionService -h [power_on_amt_host] -P 16992 -u admin -p <your-intel-me-amt-password> -k ListenerEnabled=true"
+			puts ""
+		}
+
+	}
+
 	#
-	# amttool expects in the environment variable AMT_PASSWORD the password
+	# password via environment variable for amtterm will not show up in logs
 	#
 	set ::env(AMT_PASSWORD) [log_amt_password]