diff --git a/subprojects/gst-rtsp-server/gst/rtsp-sink/gstrtspclientsink.c b/subprojects/gst-rtsp-server/gst/rtsp-sink/gstrtspclientsink.c
index 854b60a92c..6368253ab3 100644
--- a/subprojects/gst-rtsp-server/gst/rtsp-sink/gstrtspclientsink.c
+++ b/subprojects/gst-rtsp-server/gst/rtsp-sink/gstrtspclientsink.c
@@ -2341,6 +2341,7 @@ gst_rtsp_client_sink_loop_rx (GstRTSPClientSink * sink)
         break;
       case GST_RTSP_ENET:
         GST_DEBUG_OBJECT (sink, "An ethernet problem occured.");
+        /* FALLTHROUGH */
       default:
         GST_ELEMENT_WARNING (sink, RESOURCE, READ, (NULL),
             ("Unhandled return value %d.", res));
@@ -2988,7 +2989,8 @@ receive_error:
                       FALSE)) == 0)
             goto again;
         }
-        /* only try once after reconnect, then fallthrough and error out */
+        /* only try once after reconnect, else carry on and error out */
+        /* FALLTHROUGH */
       default:
       {
         gchar *str = gst_rtsp_strresult (res);
@@ -4912,8 +4914,8 @@ gst_rtsp_client_sink_handle_message (GstBin * bin, GstMessage * message)
             gst_element_state_get_name (newstate),
             gst_element_state_get_name (pending), rtsp_client_sink->prerolled);
       }
-      /* fallthrough */
     }
+      /* FALLTHROUGH */
     default:
     {
       GST_BIN_CLASS (parent_class)->handle_message (bin, message);
diff --git a/subprojects/gst-rtsp-server/meson.build b/subprojects/gst-rtsp-server/meson.build
index 6990bb0fe6..3e71202e00 100644
--- a/subprojects/gst-rtsp-server/meson.build
+++ b/subprojects/gst-rtsp-server/meson.build
@@ -109,23 +109,28 @@ cdata.set_quoted('GST_PACKAGE_ORIGIN', get_option('package-origin'))
 
 rtspserver_args = ['-DHAVE_CONFIG_H']
 
+# NOTE: Keep entries alphabetically sorted
 warning_flags = [
-  '-Wmissing-declarations',
-  '-Wmissing-prototypes',
-  '-Wredundant-decls',
-  '-Wundef',
-  '-Wwrite-strings',
+  '-Waddress',
+  '-Waggregate-return',
   '-Wformat',
   '-Wformat-nonliteral',
   '-Wformat-security',
-  '-Wold-style-definition',
-  '-Waggregate-return',
+  '-Wimplicit-fallthrough=3',
   '-Winit-self',
+  '-Wmissing-declarations',
   '-Wmissing-include-dirs',
-  '-Waddress',
+  '-Wmissing-parameter-type',
+  '-Wmissing-prototypes',
   '-Wno-multichar',
-  '-Wvla',
+  '-Wold-style-definition',
   '-Wpointer-arith',
+  '-Wredundant-decls',
+  '-Wshift-negative-value',
+  '-Wtype-limits',
+  '-Wundef',
+  '-Wvla',
+  '-Wwrite-strings',
 ]
 
 foreach extra_arg : warning_flags