diff --git a/src/TEF6686.cpp b/src/TEF6686.cpp
index 0af34ed..542a8e8 100644
--- a/src/TEF6686.cpp
+++ b/src/TEF6686.cpp
@@ -703,7 +703,7 @@ void TEF6686::readRDS(byte showrdserrors)
 
                   bool isValuePresent = false;
                   for (int i = 0; i < 50; i++) {                                                // Check if already in list
-                    if ((buffer0 == currentfreq) || buffer0 == 0 || af[i].frequency == buffer0) {
+                    if (rds.sortaf && (buffer0 == currentfreq) || buffer0 == 0 || af[i].frequency == buffer0) {
                       isValuePresent = true;
                       break;
                     }
@@ -717,7 +717,7 @@ void TEF6686::readRDS(byte showrdserrors)
 
                   isValuePresent = false;
                   for (int i = 0; i < 50; i++) {                                                // Check if already in list
-                    if ((buffer1 == currentfreq) || buffer1 == 0 || af[i].frequency == buffer1) {
+                    if (rds.sortaf && (buffer1 == currentfreq) || buffer1 == 0 || af[i].frequency == buffer1) {
                       isValuePresent = true;
                       break;
                     }
@@ -1817,4 +1817,4 @@ void TEF6686::RDScharConverter(const char* input, wchar_t* output, size_t size,
     }
   }
   output[size - 1] = L'\0';
-}
\ No newline at end of file
+}