diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4cf8a639..409b0805 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -137,6 +137,8 @@ Clients:
   precision for some parameters.
 - Add `--version` for all clients.
 - Fix description of `-e` and `-t` arguments in mosquitto_rr. Closes #1881.
+- mosquitto_sub will now quit with an error if the %U option is used on
+  Windows, rather than just quitting. Closes #1908.
 
 
 1.6.12 - 2020-08-19
diff --git a/client/client_shared.c b/client/client_shared.c
index c43775a9..6d6f448a 100644
--- a/client/client_shared.c
+++ b/client/client_shared.c
@@ -132,6 +132,10 @@ static int check_format(const char *str)
 					// JSON output, assuming JSON payload
 				}else if(str[i+1] == 'U'){
 					// Unix time+nanoseconds
+#ifdef WIN32
+					fprintf(stderr, "Error: The %%U format option is not supported on Windows.\n");
+					return 1;
+#endif
 				}else if(str[i+1] == 'x' || str[i+1] == 'X'){
 					// payload in hex
 				}else{