diff --git a/apps/api/src/assets/sitemap.xml b/apps/api/src/assets/sitemap.xml
index 015a6f67b..4fbc9efac 100644
--- a/apps/api/src/assets/sitemap.xml
+++ b/apps/api/src/assets/sitemap.xml
@@ -1092,6 +1092,10 @@
     <loc>https://ghostfol.io/nl/veelgestelde-vragen</loc>
     <lastmod>${currentDate}T00:00:00+00:00</lastmod>
   </url>
+  <url>
+    <loc>https://ghostfol.io/pl</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
   <url>
     <loc>https://ghostfol.io/pt</loc>
     <lastmod>${currentDate}T00:00:00+00:00</lastmod>
diff --git a/apps/client/project.json b/apps/client/project.json
index 0d2e589dc..0ccce26d8 100644
--- a/apps/client/project.json
+++ b/apps/client/project.json
@@ -60,6 +60,10 @@
           "baseHref": "/nl/",
           "localize": ["nl"]
         },
+        "development-pl": {
+          "baseHref": "/pl/",
+          "localize": ["pl"]
+        },
         "development-pt": {
           "baseHref": "/pt/",
           "localize": ["pt"]
@@ -170,6 +174,9 @@
         "development-nl": {
           "browserTarget": "client:build:development-nl"
         },
+        "development-pl": {
+          "browserTarget": "client:build:development-pl"
+        },
         "development-pt": {
           "browserTarget": "client:build:development-pt"
         },
@@ -193,6 +200,7 @@
           "messages.fr.xlf",
           "messages.it.xlf",
           "messages.nl.xlf",
+          "messages.pl.xlf",
           "messages.pt.xlf",
           "messages.tr.xlf"
         ]
@@ -235,6 +243,10 @@
         "baseHref": "/nl/",
         "translation": "apps/client/src/locales/messages.nl.xlf"
       },
+      "pl": {
+        "baseHref": "/pl/",
+        "translation": "apps/client/src/locales/messages.pl.xlf"
+      },
       "pt": {
         "baseHref": "/pt/",
         "translation": "apps/client/src/locales/messages.pt.xlf"
diff --git a/apps/client/src/app/app.component.html b/apps/client/src/app/app.component.html
index c6ff195f1..31281fe48 100644
--- a/apps/client/src/app/app.component.html
+++ b/apps/client/src/app/app.component.html
@@ -150,6 +150,11 @@
           <li>
             <a href="../nl" title="Ghostfolio in Nederlands">Nederlands</a>
           </li>
+          <!--
+            <li>
+              <a href="../pl" title="Ghostfolio in Polski">Polski</a>
+            </li>
+          -->
           <li>
             <a href="../pt" title="Ghostfolio in Português">Português</a>
           </li>
diff --git a/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts b/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts
index 3fb3592e0..3a1e02596 100644
--- a/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts
+++ b/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts
@@ -44,6 +44,7 @@ export class UserAccountSettingsComponent implements OnDestroy, OnInit {
     'fr',
     'it',
     'nl',
+    'pl',
     'pt',
     'tr'
   ];
diff --git a/apps/client/src/app/components/user-account-settings/user-account-settings.html b/apps/client/src/app/components/user-account-settings/user-account-settings.html
index 87762d449..4d55bbc27 100644
--- a/apps/client/src/app/components/user-account-settings/user-account-settings.html
+++ b/apps/client/src/app/components/user-account-settings/user-account-settings.html
@@ -74,6 +74,10 @@
                     >Nederlands (<ng-container i18n>Community</ng-container
                     >)</mat-option
                   >
+                  <mat-option value="pl"
+                    >Polski (<ng-container i18n>Community</ng-container
+                    >)</mat-option
+                  >
                   <mat-option value="pt"
                     >Português (<ng-container i18n>Community</ng-container
                     >)</mat-option
diff --git a/apps/client/src/app/pages/features/features-page.html b/apps/client/src/app/pages/features/features-page.html
index c63fa9a49..9621d61fa 100644
--- a/apps/client/src/app/pages/features/features-page.html
+++ b/apps/client/src/app/pages/features/features-page.html
@@ -245,7 +245,8 @@
                 <h4 i18n>Multi-Language</h4>
                 <p class="m-0">
                   Use Ghostfolio in multiple languages: English, Dutch, French,
-                  German, Italian, Portuguese, Spanish and Turkish are currently
+                  German, Italian,
+                  <!-- Polish, -->Portuguese, Spanish and Turkish are currently
                   supported.
                 </p>
               </div>
diff --git a/libs/common/src/lib/config.ts b/libs/common/src/lib/config.ts
index 0313434bf..b8369d60a 100644
--- a/libs/common/src/lib/config.ts
+++ b/libs/common/src/lib/config.ts
@@ -101,6 +101,7 @@ export const SUPPORTED_LANGUAGE_CODES = [
   'fr',
   'it',
   'nl',
+  'pl',
   'pt',
   'tr'
 ];
diff --git a/libs/common/src/lib/helper.ts b/libs/common/src/lib/helper.ts
index 5b124c732..f9bf53005 100644
--- a/libs/common/src/lib/helper.ts
+++ b/libs/common/src/lib/helper.ts
@@ -10,7 +10,7 @@ import {
   parseISO,
   subDays
 } from 'date-fns';
-import { de, es, fr, it, nl, pt, tr } from 'date-fns/locale';
+import { de, es, fr, it, nl, pl, pt, tr } from 'date-fns/locale';
 
 import { ghostfolioScraperApiSymbolPrefix, locale } from './config';
 import { Benchmark, UniqueAsset } from './interfaces';
@@ -106,6 +106,8 @@ export function getDateFnsLocale(aLanguageCode: string) {
     return it;
   } else if (aLanguageCode === 'nl') {
     return nl;
+  } else if (aLanguageCode === 'pl') {
+    return pl;
   } else if (aLanguageCode === 'pt') {
     return pt;
   } else if (aLanguageCode === 'tr') {