diff --git a/src/compatibility.cpp b/src/compatibility.cpp
index 351c2672a..7bd28e5d9 100644
--- a/src/compatibility.cpp
+++ b/src/compatibility.cpp
@@ -141,6 +141,7 @@ static FCompatOption Options[] =
 	{ "maskedmidtex",			COMPATF_MASKEDMIDTEX, SLOT_COMPAT },
 	{ "badangles",				COMPATF2_BADANGLES, SLOT_COMPAT2 },
 	{ "floormove",				COMPATF2_FLOORMOVE, SLOT_COMPAT2 },
+	{ "soundcutoff",			COMPATF2_SOUNDCUTOFF, SLOT_COMPAT2 },
 
 	{ NULL, 0, 0 }
 };
diff --git a/src/d_main.cpp b/src/d_main.cpp
index 255994fb5..79c899085 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -620,6 +620,7 @@ CVAR (Flag, compat_polyobj,				compatflags,  COMPATF_POLYOBJ);
 CVAR (Flag, compat_maskedmidtex,		compatflags,  COMPATF_MASKEDMIDTEX);
 CVAR (Flag, compat_badangles,			compatflags2, COMPATF2_BADANGLES);
 CVAR (Flag, compat_floormove,			compatflags2, COMPATF2_FLOORMOVE);
+CVAR (Flag, compat_soundcutoff,			compatflags2, COMPATF2_SOUNDCUTOFF);
 
 //==========================================================================
 //
diff --git a/src/doomdef.h b/src/doomdef.h
index 3e00975cf..767f97661 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -339,6 +339,7 @@ enum
 
 	COMPATF2_BADANGLES		= 1 << 0,	// It is impossible to face directly NSEW.
 	COMPATF2_FLOORMOVE		= 1 << 1,	// Use the same floor motion behavior as Doom.
+	COMPATF2_SOUNDCUTOFF	= 1 << 2,	// Cut off sounds when an actor vanishes instead of making it owner-less
 };
 
 // Emulate old bugs for select maps. These are not exposed by a cvar
diff --git a/src/g_mapinfo.cpp b/src/g_mapinfo.cpp
index 5a451dfaa..b68408237 100644
--- a/src/g_mapinfo.cpp
+++ b/src/g_mapinfo.cpp
@@ -1306,6 +1306,7 @@ MapFlagHandlers[] =
 	{ "compat_maskedmidtex",			MITYPE_COMPATFLAG, COMPATF_MASKEDMIDTEX, 0 },
 	{ "compat_badangles",				MITYPE_COMPATFLAG, 0, COMPATF2_BADANGLES },
 	{ "compat_floormove",				MITYPE_COMPATFLAG, 0, COMPATF2_FLOORMOVE },
+	{ "compat_soundcutoff",				MITYPE_COMPATFLAG, 0, COMPATF2_SOUNDCUTOFF },
 	{ "cd_start_track",					MITYPE_EATNEXT,	0, 0 },
 	{ "cd_end1_track",					MITYPE_EATNEXT,	0, 0 },
 	{ "cd_end2_track",					MITYPE_EATNEXT,	0, 0 },
diff --git a/src/s_sound.cpp b/src/s_sound.cpp
index 035b71c74..75bd33d47 100644
--- a/src/s_sound.cpp
+++ b/src/s_sound.cpp
@@ -1575,7 +1575,7 @@ void S_RelinkSound (AActor *from, AActor *to)
 			{
 				chan->Actor = to;
 			}
-			else if (!(chan->ChanFlags & CHAN_LOOP))
+			else if (!(chan->ChanFlags & CHAN_LOOP) && !(compatflags2 & COMPATF2_SOUNDCUTOFF))
 			{
 				chan->Actor = NULL;
 				chan->SourceType = SOURCE_Unattached;
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index 13565da7f..3d5a3ea3c 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -1300,6 +1300,7 @@ OptionMenu "CompatibilityOptions"
 	Option "Ignore Y offsets on masked midtextures",	"compat_MASKEDMIDTEX", "YesNo"
 	Option "Cannot travel straight NSEW",				"compat_badangles", "YesNo"
 	Option "Use Doom's floor motion behavior",			"compat_floormove", "YesNo"
+	Option "Sounds stop when actor vanishes",			"compat_soundcutoff", "YesNo"
 	
 	Class "CompatibilityMenu"
 }