diff --git a/apps/wps.c b/apps/wps.c
index 37f849de91..38e9aa43af 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -321,6 +321,10 @@ bool display_custom_wps(int x_val, int y_val, bool do_scroll, char *wps_string)
                             case 'd':  /* ID3 Album/Disc */
                                 snprintf(tmpbuf, sizeof(tmpbuf), "%s", id3->album);
                                 break;
+                            case '\r':
+                            case '\n':
+                                /* As of yet, do nothing with these */
+                                break;
                         }
                         break;
                     case 'f':  /* File Information */
@@ -363,6 +367,10 @@ bool display_custom_wps(int x_val, int y_val, bool do_scroll, char *wps_string)
                                 snprintf(tmpbuf, sizeof(tmpbuf), "%d",
                                         id3->filesize / 1024);
                                 break;
+                            case '\r':
+                            case '\n':
+                                /* As of yet, do nothing with these */
+                                break;
                         }
                         break;
                     case 'p':  /* Playlist/Song Information */
@@ -386,6 +394,10 @@ bool display_custom_wps(int x_val, int y_val, bool do_scroll, char *wps_string)
                                         id3->elapsed / 60000,
                                         id3->elapsed % 60000 / 1000);
                                 break;
+                            case '\r':
+                            case '\n':
+                                /* As of yet, do nothing with these */
+                                break;
                         }
                         break;
                     case '%':  /* Displays % */
@@ -425,6 +437,10 @@ bool display_custom_wps(int x_val, int y_val, bool do_scroll, char *wps_string)
                         break;
                 }
                 break;
+            case '\r':
+            case '\n':
+                /* As of yet, do nothing with these */
+                break;
             default:
                 switch(con_flag)
                 {