diff --git a/app/scripts/components/results.js b/app/scripts/components/results.js
index b0b9f2659..f73e68c1e 100644
--- a/app/scripts/components/results.js
+++ b/app/scripts/components/results.js
@@ -14,6 +14,7 @@ import "@/components/sidebar"
 import "@/components/tab-hash"
 import "@/components/word-picture"
 import "@/directives/tab-preloader"
+import settings from "@/settings"
 
 angular.module("korpApp").component("results", {
     template: html`
@@ -21,110 +22,105 @@ angular.module("korpApp").component("results", {
             <div id="results-wrapper" ng-show="$ctrl.hasResult()">
                 <div class="flex" id="columns" ng-class="{sidebar_visible : $ctrl.sidebarVisible}">
                     <div class="overflow-auto grow" id="left-column">
-                        <tab-hash key="result_tab">
-                            <uib-tabset class="tabbable result_tabs" active="activeTab">
-                                <uib-tab kwic-ctrl index="0" select="onentry()" deselect="onexit()">
-                                    <uib-tab-heading ng-class="{not_loading: progress > 99, loading : loading}"
-                                        >KWIC<tab-preloader
-                                            ng-if="loading"
-                                            value="progress"
-                                            spinner="countCorpora() < 2"
-                                        ></tab-preloader>
-                                    </uib-tab-heading>
-                                    <div
-                                        class="results-kwic"
-                                        ng-class="{reading_mode : reading_mode, loading: loading}"
-                                    >
-                                        <korp-error ng-if="error"></korp-error>
-                                        <kwic
-                                            ng-if="!error"
-                                            aborted="aborted"
-                                            loading="loading"
-                                            active="active"
-                                            hits-in-progress="hitsInProgress"
-                                            hits="hits"
-                                            kwic-input="kwic"
-                                            corpus-hits="corpusHits"
-                                            is-reading="reading_mode"
-                                            page="page"
-                                            page-event="pageChange"
-                                            context-change-event="toggleReading"
-                                            hits-per-page="hitsPerPage"
-                                            prev-params="proxy.prevParams"
-                                            prev-request="proxy.prevRequest"
-                                            corpus-order="corpusOrder"
-                                        ></kwic>
-                                    </div>
-                                </uib-tab>
-                                <uib-tab
-                                    stats-result-ctrl
-                                    ng-if="$root._settings.statistics != false"
-                                    select="onentry()"
-                                    deselect="onexit()"
-                                    index="2"
-                                >
-                                    <uib-tab-heading ng-class="{not_loading: progress > 99, loading : loading}"
-                                        >{{'statistics' | loc:$root.lang}}
-                                        <tab-preloader
-                                            ng-if="loading"
-                                            value="progress"
-                                            spinner="countCorpora() < 2"
-                                        ></tab-preloader>
-                                    </uib-tab-heading>
+                        <uib-tabset class="tabbable result_tabs" active="activeTab">
+                            <uib-tab kwic-ctrl index="0" select="onentry()" deselect="onexit()">
+                                <uib-tab-heading ng-class="{not_loading: progress > 99, loading : loading}"
+                                    >KWIC<tab-preloader
+                                        ng-if="loading"
+                                        value="progress"
+                                        spinner="countCorpora() < 2"
+                                    ></tab-preloader>
+                                </uib-tab-heading>
+                                <div class="results-kwic" ng-class="{reading_mode : reading_mode, loading: loading}">
                                     <korp-error ng-if="error"></korp-error>
-                                    <statistics
+                                    <kwic
+                                        ng-if="!error"
                                         aborted="aborted"
-                                        activate="activate"
-                                        columns="columns"
-                                        data="data"
-                                        error="error"
-                                        grid-data="gridData"
-                                        has-result="hasResult"
-                                        in-order="inOrder"
                                         loading="loading"
-                                        no-hits="no_hits"
+                                        active="active"
+                                        hits-in-progress="hitsInProgress"
+                                        hits="hits"
+                                        kwic-input="kwic"
+                                        corpus-hits="corpusHits"
+                                        is-reading="reading_mode"
+                                        page="page"
+                                        page-event="pageChange"
+                                        context-change-event="toggleReading"
+                                        hits-per-page="hitsPerPage"
                                         prev-params="proxy.prevParams"
-                                        search-params="searchParams"
-                                        show-statistics="showStatistics"
-                                    ></statistics>
-                                </uib-tab>
-                                <uib-tab
-                                    ng-if="$root._settings['word_picture'] != false"
-                                    wordpic-ctrl
-                                    index="3"
-                                    select="onentry()"
-                                    deselect="onexit()"
-                                >
-                                    <uib-tab-heading ng-class="{not_loading: progress > 99, loading : loading}">
-                                        {{'word_picture' | loc:$root.lang}}
-                                        <tab-preloader
-                                            ng-if="loading"
-                                            value="progress"
-                                            spinner="countCorpora() < 2"
-                                        ></tab-preloader>
-                                    </uib-tab-heading>
-                                    <div ng-if="!error">
-                                        <word-picture
-                                            data="data"
-                                            word-pic="wordPic"
-                                            activate="activate"
-                                            loading="loading"
-                                            has-data="hasData"
-                                            aborted="aborted"
-                                            hit-settings="hitSettings"
-                                            settings="settings"
-                                            no-hits="noHits"
-                                        ></word-picture>
-                                    </div>
-                                    <korp-error ng-if="error"></korp-error>
-                                </uib-tab>
-                                <kwic-tabs tabs="$root.kwicTabs"></kwic-tabs>
-                                <graph-tabs tabs="$root.graphTabs"></graph-tabs>
-                                <compare-tabs tabs="$root.compareTabs"></compare-tabs>
-                                <map-tabs tabs="$root.mapTabs"></map-tabs>
-                                <text-tabs tabs="$root.textTabs"></text-tabs>
-                            </uib-tabset>
-                        </tab-hash>
+                                        prev-request="proxy.prevRequest"
+                                        corpus-order="corpusOrder"
+                                    ></kwic>
+                                </div>
+                            </uib-tab>
+                            <uib-tab
+                                stats-result-ctrl
+                                ng-if="hasStatistics"
+                                select="onentry()"
+                                deselect="onexit()"
+                                index="2"
+                            >
+                                <uib-tab-heading ng-class="{not_loading: progress > 99, loading : loading}"
+                                    >{{'statistics' | loc:$root.lang}}
+                                    <tab-preloader
+                                        ng-if="loading"
+                                        value="progress"
+                                        spinner="countCorpora() < 2"
+                                    ></tab-preloader>
+                                </uib-tab-heading>
+                                <korp-error ng-if="error"></korp-error>
+                                <statistics
+                                    aborted="aborted"
+                                    activate="activate"
+                                    columns="columns"
+                                    data="data"
+                                    error="error"
+                                    grid-data="gridData"
+                                    has-result="hasResult"
+                                    in-order="inOrder"
+                                    loading="loading"
+                                    no-hits="no_hits"
+                                    prev-params="proxy.prevParams"
+                                    search-params="searchParams"
+                                    show-statistics="showStatistics"
+                                ></statistics>
+                            </uib-tab>
+                            <uib-tab
+                                ng-if="hasWordPicture"
+                                wordpic-ctrl
+                                index="3"
+                                select="onentry()"
+                                deselect="onexit()"
+                            >
+                                <uib-tab-heading ng-class="{not_loading: progress > 99, loading : loading}">
+                                    {{'word_picture' | loc:$root.lang}}
+                                    <tab-preloader
+                                        ng-if="loading"
+                                        value="progress"
+                                        spinner="countCorpora() < 2"
+                                    ></tab-preloader>
+                                </uib-tab-heading>
+                                <div ng-if="!error">
+                                    <word-picture
+                                        data="data"
+                                        word-pic="wordPic"
+                                        activate="activate"
+                                        loading="loading"
+                                        has-data="hasData"
+                                        aborted="aborted"
+                                        hit-settings="hitSettings"
+                                        settings="settings"
+                                        no-hits="noHits"
+                                    ></word-picture>
+                                </div>
+                                <korp-error ng-if="error"></korp-error>
+                            </uib-tab>
+                            <kwic-tabs tabs="$root.kwicTabs"></kwic-tabs>
+                            <graph-tabs tabs="$root.graphTabs"></graph-tabs>
+                            <compare-tabs tabs="$root.compareTabs"></compare-tabs>
+                            <map-tabs tabs="$root.mapTabs"></map-tabs>
+                            <text-tabs tabs="$root.textTabs"></text-tabs>
+                        </uib-tabset>
                         <a id="json-link" ng-href="{{$root.jsonUrl}}" ng-show="$root.jsonUrl" target="_blank">
                             <img src="img/json.png" />
                         </a>
@@ -143,8 +139,10 @@ angular.module("korpApp").component("results", {
     bindings: {},
     controller: [
         "$rootScope",
+        "$scope",
         "searches",
-        function ($rootScope, searches) {
+        "utils",
+        function ($rootScope, $scope, searches, utils) {
             const $ctrl = this
             $ctrl.searches = searches
             $ctrl.onSidebarShow = () => ($ctrl.sidebarVisible = true)
@@ -155,6 +153,24 @@ angular.module("korpApp").component("results", {
                 $rootScope.compareTabs.length ||
                 $rootScope.graphTabs.length ||
                 $rootScope.mapTabs.length
+
+            $scope.hasStatistics = settings.statistics !== false
+            $scope.hasWordPicture = settings.word_picture !== false
+
+            function updateTabs() {
+                $scope.tabCount =
+                    2 + ($scope.hasStatistics ? 1 : 0) + ($scope.hasWordPicture ? 1 : 0) + $rootScope.kwicTabs.length // TODO + ...
+            }
+
+            $scope.$watch($rootScope.kwicTabs, updateTabs)
+            // TODO watch other tabs too
+            updateTabs()
+
+            utils.setupHash($scope, {
+                key: "result_tab",
+                scope_name: "activeTab",
+                val_in: (tab) => Math.min(tab, $scope.tabCount),
+            })
         },
     ],
 })
diff --git a/app/scripts/settings/app-settings.types.ts b/app/scripts/settings/app-settings.types.ts
index 710cd4017..7f9f0fc70 100644
--- a/app/scripts/settings/app-settings.types.ts
+++ b/app/scripts/settings/app-settings.types.ts
@@ -57,11 +57,12 @@ export type AppSettings = {
     news_url?: string
     reduce_word_attribute_selector: "union" | "intersection"
     reduce_struct_attribute_selector: "union" | "intersection"
+    statistics?: false
     statistics_search_default: boolean
     urnResolver?: string
     visible_modes: number
     word_label: Record<string, string>
-    word_picture?: boolean
+    word_picture?: false
     word_picture_tagset?: Record<string, string>
     word_picture_conf?: Record<string, WordPictureDef[]>
 }