diff --git a/app/Support/Steam.php b/app/Support/Steam.php
index b25e8851a1..7d42d8dc32 100644
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -614,6 +614,11 @@ class Steam
         if ('equal' === $locale) {
             return $this->getLanguage();
         }
+        
+        // Check for Windows to replace the locale correctly.
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+            $locale = str_replace('_', '-', $locale);
+        }
 
         return $locale;
     }
@@ -627,7 +632,6 @@ class Steam
         return [
             sprintf('%s.utf8', $locale),
             sprintf('%s.UTF-8', $locale),
-            str_replace('_', '-', $locale), // for Windows.
         ];
     }
 
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index e36ebe2f75..af29b9abc6 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -573,7 +573,6 @@ return [
     'pref_locale'                               => 'Locale settings',
     'pref_languages_help'                       => 'Firefly III supports several languages. Which one do you prefer?',
     'pref_locale_help'                          => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
-    'pref_locale_no_windows'                    => 'This feature may not work on Windows.',
     'pref_locale_no_demo'                       => 'This feature won\'t work for the demo user.',
     'pref_custom_fiscal_year'                   => 'Fiscal year settings',
     'pref_custom_fiscal_year_label'             => 'Enabled',
diff --git a/resources/views/v1/preferences/index.twig b/resources/views/v1/preferences/index.twig
index 5eb9180d92..c469e17f8c 100644
--- a/resources/views/v1/preferences/index.twig
+++ b/resources/views/v1/preferences/index.twig
@@ -72,7 +72,6 @@
                                         <ul class="text-warning">
 
                                             {% if IS_DEMO_SITE %}<li class="text-danger">{{ 'pref_locale_no_demo'|_ }}</li>{% endif %}
-                                            <li>{{ 'pref_locale_no_windows'|_ }}</li>
                                         </ul>
                                     </div>
                                     {% else %}