diff --git a/lib/wttr_srv.py b/lib/wttr_srv.py
index ca42f90..fda492b 100644
--- a/lib/wttr_srv.py
+++ b/lib/wttr_srv.py
@@ -17,7 +17,7 @@ import fmt.png
 import parse_query
 from translations import get_message, FULL_TRANSLATION, PARTIAL_TRANSLATION, SUPPORTED_LANGS
 from buttons import add_buttons
-from globals import get_help_file, \
+from globals import get_help_file, remove_ansi, \
                     BASH_FUNCTION_FILE, TRANSLATION_FILE, LOG_FILE, \
                     NOT_FOUND_LOCATION, \
                     MALFORMED_RESPONSE_HTML_PAGE, \
@@ -230,7 +230,10 @@ def _response(parsed_query, query, fast_mode=False):
             if parsed_query['html_output']:
                 output = add_buttons(output)
             else:
-                output += '\n' + get_message('FOLLOW_ME', parsed_query['lang']) + '\n'
+                message = get_message('FOLLOW_ME', parsed_query['lang'])
+                if parsed_query.get('no-terminal', False):
+                    message = remove_ansi(message)
+                output += '\n' + message + '\n'
 
     return cache.store(cache_signature, output)