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