diff --git a/src/common/server.c b/src/common/server.c
index f9ca809e..d09f6c40 100644
--- a/src/common/server.c
+++ b/src/common/server.c
@@ -1657,6 +1657,12 @@ server_set_encoding (server *serv, char *new_encoding)
 			g_free (serv->encoding);
 			serv->encoding = g_strdup ("UTF-8");
 		}
+
+		else if (!servlist_check_encoding (serv->encoding))
+		{
+			g_free (serv->encoding);
+			serv->encoding = g_strdup ("UTF-8");
+		}
 	}
 	else
 	{