diff --git a/layouts/partials/helpers/country-code.html b/layouts/partials/helpers/country-code.html
index 0c5e365..925d70e 100644
--- a/layouts/partials/helpers/country-code.html
+++ b/layouts/partials/helpers/country-code.html
@@ -20,10 +20,5 @@
     {{ end }}
 {{ end }}
 
-{{/*  if specified via "params.showFlags" field, then countryCode is set to be empty. */}}
-{{ if eq site.Params.showFlags false }}
-    {{ $countryCode = "" }}
-{{ end }}
-
 {{/*  return the country code  */}}
 {{ return $countryCode }}
diff --git a/layouts/partials/navigators/floating-lang-selector.html b/layouts/partials/navigators/floating-lang-selector.html
index 625c01f..921fdc5 100644
--- a/layouts/partials/navigators/floating-lang-selector.html
+++ b/layouts/partials/navigators/floating-lang-selector.html
@@ -5,15 +5,19 @@
 
 <div class="dropdown languageSelector">
     <a class="btn dropdown-toggle" href="#" id="languageSelector" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        {{ $countryCode := partial "helpers/country-code.html" . }}
-        <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+        {{ if ne site.Params.showFlags false }}
+            {{ $countryCode := partial "helpers/country-code.html" . }}
+            <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+        {{ end }}
         {{ site.Language.LanguageName }}
     </a>
     <div class="dropdown-menu" aria-labelledby="languageSelector">
         {{ range .Translations }}
         <a class="dropdown-item nav-link languages-item" href="{{ path.Join "/" (cond (eq .Language.Lang "en") "" .Language.Lang) $pageURL }}">
-            {{ $countryCode := partial "helpers/country-code.html" . }}
-            <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+            {{ if ne site.Params.showFlags false }}
+                {{ $countryCode := partial "helpers/country-code.html" . }}
+                <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+            {{ end }}
             {{ .Language.LanguageName }}
         </a>
         {{ end }}
diff --git a/layouts/partials/navigators/lang-selector-2.html b/layouts/partials/navigators/lang-selector-2.html
index 606a503..1a1611c 100644
--- a/layouts/partials/navigators/lang-selector-2.html
+++ b/layouts/partials/navigators/lang-selector-2.html
@@ -5,17 +5,19 @@
 
 <li class="nav-item dropdown">
     <a class="nav-link dropdown-toggle" href="#" id="languageSelector" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-      {{ $countryCode := partial "helpers/country-code.html" . }}
-      {{ if ne $countryCode "" }}
-      <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+      {{ if ne site.Params.showFlags false }}
+        {{ $countryCode := partial "helpers/country-code.html" . }}
+        <span class="flag-icon flag-icon-{{$countryCode}}"></span>
       {{ end }}
       {{ site.Language.LanguageName }}
     </a>
     <div class="dropdown-menu" aria-labelledby="languageSelector">
       {{ range .Translations }}
         <a class="dropdown-item nav-link languages-item" href="{{ path.Join "/" (cond (eq .Language.Lang "en") "" .Language.Lang) $pageURL }}">
-          {{ $countryCode := partial "helpers/country-code.html" . }}
-          <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+          {{ if ne site.Params.showFlags false }}
+            {{ $countryCode := partial "helpers/country-code.html" . }}
+            <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+          {{ end }}
           {{ .Language.LanguageName }}
         </a>
       {{ end }}
diff --git a/layouts/partials/navigators/lang-selector.html b/layouts/partials/navigators/lang-selector.html
index 29e9c9b..87c34fe 100644
--- a/layouts/partials/navigators/lang-selector.html
+++ b/layouts/partials/navigators/lang-selector.html
@@ -1,19 +1,20 @@
 <li class="nav-item dropdown">
     <a class="nav-link dropdown-toggle" href="#" id="languageSelector" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        {{ $countryCode := partial "helpers/country-code.html" . }}
-        {{ if ne $countryCode "" }}
-        <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+        {{ if ne site.Params.showFlags false }}
+            {{ $countryCode := partial "helpers/country-code.html" . }}
+            <span class="flag-icon flag-icon-{{$countryCode}}"></span>
         {{ end }}
         {{ site.Language.LanguageName }}
     </a>
     <div class="dropdown-menu" aria-labelledby="languageSelector">
         {{ range site.Home.AllTranslations }}
         <a class="dropdown-item nav-link languages-item" href="{{ .RelPermalink }}">
-            {{ $countryCode := partial "helpers/country-code.html" . }}
-            <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+            {{ if ne site.Params.showFlags false }}
+                {{ $countryCode := partial "helpers/country-code.html" . }}
+                <span class="flag-icon flag-icon-{{$countryCode}}"></span>
+            {{ end }}
             {{ .Language.LanguageName }}
         </a>
         {{ end }}
     </div>
     </li>
-    
\ No newline at end of file