diff --git a/src/rds.c b/src/rds.c
index bb6f40e..df2c118 100644
--- a/src/rds.c
+++ b/src/rds.c
@@ -823,7 +823,7 @@ void set_rds_rt1(RDSEncoder* enc, char *rt1) {
 	memset(enc->data[enc->program].rt1, ' ', RT_LENGTH);
 	while (*rt1 != 0 && len < RT_LENGTH) enc->data[enc->program].rt1[len++] = *rt1++;
 
-	while (len > 0 && enc->data[enc->program].rt1[len - 1] == ' ') {
+	while (len > 0 && enc->data[enc->program].rt1[len - 1] == ' ' && enc->data[enc->program].shortrt) {
         len--;
     }
 
@@ -849,7 +849,7 @@ void set_rds_rt2(RDSEncoder* enc, char *rt2) {
 	memset(enc->data[enc->program].rt2, ' ', RT_LENGTH);
 	while (*rt2 != 0 && len < RT_LENGTH) enc->data[enc->program].rt2[len++] = *rt2++;
 
-	while (len > 0 && enc->data[enc->program].rt2[len - 1] == ' ') {
+	while (len > 0 && enc->data[enc->program].rt2[len - 1] == ' ' && enc->data[enc->program].shortrt) {
 		len--;
 	}