diff --git a/pkg/daemon_src.dpkdir/sound/null.wav b/pkg/daemon_src.dpkdir/sound/null.wav
deleted file mode 100644
index 20646c6dfd..0000000000
Binary files a/pkg/daemon_src.dpkdir/sound/null.wav and /dev/null differ
diff --git a/src/engine/audio/Sample.cpp b/src/engine/audio/Sample.cpp
index 4e6f049cf0..25dd6d36c4 100644
--- a/src/engine/audio/Sample.cpp
+++ b/src/engine/audio/Sample.cpp
@@ -44,8 +44,22 @@ namespace Audio {
         audioLogs.Debug("Deleting Sample '%s'", GetName());
     }
 
+	static AudioData GenerateNullSample() {
+		// 8KHz 16bit mono.
+		AudioData out { 8000, 2, 1 };
+		// 1 sample, silence.
+		out.rawSamples.resize( 2 );
+		return out;
+	}
+
     bool Sample::Load() {
         audioLogs.Debug("Loading Sample '%s'", GetName());
+
+		if ( GetName() == "sound/null" || GetName() == "sound/null.wav" ) {
+			buffer.Feed( GenerateNullSample() );
+			return true;
+		}
+
 	    AudioData audioData = LoadSoundCodec(GetName());
 
 	    if ( !audioData.rawSamples.size() ) {