diff --git a/recording-daemon/output.c b/recording-daemon/output.c
index f3f1933b4..8092ecac3 100644
--- a/recording-daemon/output.c
+++ b/recording-daemon/output.c
@@ -238,7 +238,12 @@ int output_config(output_t *output, const format_t *requested_format, format_t *
 	char *full_fn = NULL;
 	char suff[16] = "";
 	for (int i = 1; i < 20; i++) {
-		full_fn = g_strdup_printf("%s%s.%s", output->full_filename, suff, output->file_format);
+		if (!output->skip_filename_extension) {
+			full_fn = g_strdup_printf("%s%s.%s", output->full_filename, suff, output->file_format);
+		}
+		else {
+			full_fn = g_strdup_printf("%s%s", output->full_filename, suff);
+		}
 		if (!g_file_test(full_fn, G_FILE_TEST_EXISTS))
 			goto got_fn;
 		ilog(LOG_INFO, "Storing record in %s", full_fn);