diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
index 4e93ac90c9..0a2239d022 100644
--- a/src/basic/stdio-util.h
+++ b/src/basic/stdio-util.h
@@ -9,14 +9,12 @@
 #include "macro.h"
 
 _printf_(3, 4)
-static inline char *snprintf_ok(char *buf, size_t len, const char *format, ...) {
+static inline char* snprintf_ok(char *buf, size_t len, const char *format, ...) {
         va_list ap;
         int r;
 
         va_start(ap, format);
-        DISABLE_WARNING_FORMAT_NONLITERAL;
         r = vsnprintf(buf, len, format, ap);
-        REENABLE_WARNING;
         va_end(ap);
 
         return r >= 0 && (size_t) r < len ? buf : NULL;
diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c
index 7bd8dd6d89..897e39c533 100644
--- a/src/shared/ptyfwd.c
+++ b/src/shared/ptyfwd.c
@@ -1084,9 +1084,7 @@ int pty_forward_set_titlef(PTYForward *f, const char *format, ...) {
                 return -EBUSY;
 
         va_start(ap, format);
-        DISABLE_WARNING_FORMAT_NONLITERAL;
         r = vasprintf(&title, format, ap);
-        REENABLE_WARNING;
         va_end(ap);
         if (r < 0)
                 return -ENOMEM;