diff --git a/hqflt/filters.h b/hqflt/filters.h
index 0e73b294f2..d8b766b584 100644
--- a/hqflt/filters.h
+++ b/hqflt/filters.h
@@ -30,6 +30,7 @@
 #include "bleed.h"
 #include "ntsc.h"
 
+#define FILTER_NONE 0
 #define FILTER_HQ2X 1
 #define FILTER_HQ4X 2
 #define FILTER_GRAYSCALE 3
diff --git a/settings.c b/settings.c
index e9a36e88be..e44f751225 100644
--- a/settings.c
+++ b/settings.c
@@ -96,6 +96,7 @@ static void set_defaults(void)
    g_settings.video.smooth = video_smooth;
    g_settings.video.force_aspect = force_aspect;
    g_settings.video.aspect_ratio = SNES_ASPECT_RATIO;
+   g_settings.video.filter = FILTER_NONE;
 
    g_settings.audio.enable = audio_enable;
    g_settings.audio.out_rate = out_rate;
diff --git a/ssnes.c b/ssnes.c
index 93e3e50f8d..6a3a539d3c 100644
--- a/ssnes.c
+++ b/ssnes.c
@@ -103,7 +103,9 @@ static void video_frame(const uint16_t *data, unsigned width, unsigned height)
 #ifdef HAVE_FILTER
    uint16_t output_filter[width * height * 4 * 4];
    uint16_t output[width * height];
-   process_frame(output, data, width, height);
+
+   if (g_settings.video.filter != FILTER_NONE)
+      process_frame(output, data, width, height);
 
    switch (g_settings.video.filter)
    {