diff --git a/FredBoat/src/main/java/fredboat/command/util/WeatherCommand.java b/FredBoat/src/main/java/fredboat/command/util/WeatherCommand.java
index 5b34af05e..816b4080b 100644
--- a/FredBoat/src/main/java/fredboat/command/util/WeatherCommand.java
+++ b/FredBoat/src/main/java/fredboat/command/util/WeatherCommand.java
@@ -41,16 +41,16 @@ public void invoke(@Nonnull CommandContext context) {
         }
 
         String query = context.rawArgs;
-        String alphabeticalQuery = query.replaceAll("[^A-Za-z]", "");
+        String sanitizedQuery = query.trim().replaceAll("\\s+", " ");
 
-        if (alphabeticalQuery == null || alphabeticalQuery.length() == 0) {
+        if (sanitizedQuery == null || sanitizedQuery.length() == 0) {
             HelpCommand.sendFormattedCommandHelp(context);
             return;
         }
 
         RetrievedWeather currentWeather;
         try {
-            currentWeather = weather.getCurrentWeatherByCity(alphabeticalQuery);
+            currentWeather = weather.getCurrentWeatherByCity(sanitizedQuery);
         } catch (APILimitException e) {
             context.reply(context.i18n("tryLater"));
             return;