diff --git a/include/sway/commands.h b/include/sway/commands.h
index 545b21e60..8e91c158f 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -136,6 +136,7 @@ sway_cmd cmd_mark;
 sway_cmd cmd_mode;
 sway_cmd cmd_mouse_warping;
 sway_cmd cmd_move;
+sway_cmd cmd_nop;
 sway_cmd cmd_opacity;
 sway_cmd cmd_new_float;
 sway_cmd cmd_new_window;
diff --git a/sway/commands.c b/sway/commands.c
index 364c26da8..d9c54adc4 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -146,6 +146,7 @@ static struct cmd_handler command_handlers[] = {
 	{ "layout", cmd_layout },
 	{ "mark", cmd_mark },
 	{ "move", cmd_move },
+	{ "nop", cmd_nop },
 	{ "opacity", cmd_opacity },
 	{ "reload", cmd_reload },
 	{ "rename", cmd_rename },
diff --git a/sway/commands/nop.c b/sway/commands/nop.c
new file mode 100644
index 000000000..c12fe15ad
--- /dev/null
+++ b/sway/commands/nop.c
@@ -0,0 +1,5 @@
+#include "sway/commands.h"
+
+struct cmd_results *cmd_nop(int argc, char **argv) {
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/meson.build b/sway/meson.build
index 2a4572708..676422d07 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -64,6 +64,7 @@ sway_sources = files(
 	'commands/mouse_warping.c',
 	'commands/move.c',
 	'commands/no_focus.c',
+	'commands/nop.c',
 	'commands/output.c',
 	'commands/reload.c',
 	'commands/rename.c',
diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index 70b74a458..0378a3d59 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -167,6 +167,10 @@ They are expected to be used with *bindsym* or at runtime through *swaymsg*(1).
 *move* [to] scratchpad
 	Moves the focused window to the scratchpad.
 
+*nop* <comment>
+	A no operation command that can be used to override default behaviour. The
+	optional comment argument is ignored, but logged for debugging purposes.
+
 *reload*
 	Reloads the sway config file and applies any changes.