diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index e2a801552..c2cf4ef1e 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -627,7 +627,6 @@ de:
     post_menu_hidden_items: "Die Einträge im Menü eines Beitrags, die standardmäßig hinter einer erweiterbaren Ellipse versteckt werden sollen."
     share_links: "Bestimme, welche Dienste in welcher Reihenfolge im Teilen-Dialog auftauchen."
     track_external_right_clicks: "Verfolge, welche externen Links per Rechtsklick geöffnet werden (zum Beispiel in einem neuen Browser-Tab). Standardmäßig deaktiviert, da dies URL-Rewrites erfordert."
-    topics_per_page: "Anzahl der Themen, die auf der Themen-Übersichtsseite zu Beginn und beim Scrollen geladen werden."
     send_welcome_message: "Sende allen neuen Nutzern eine private Willkommensnachricht mit Hinweisen zur Benutzung des Forums."
     suppress_reply_directly_below: "Zeige die erweiterbare Anzahl der Antworten auf einen Beitrag nicht, falls die einzige Antwort direkt darunter folgt."
     suppress_reply_directly_above: "Verstecke das erweiterbare „Antwort auf“-Feld in einem Beitrag, wenn der beantwortete Beitrag direkt darüber angezeigt wird."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 4d5426510..774cef251 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -737,8 +737,6 @@ en:
     post_menu_hidden_items: "The menu items to hide by default in the post menu unless an expansion ellipsis is clicked on."
     share_links: "Determine which items appear on the share dialog, and in what order."
     track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
-    topics_per_page: "How many topics are loaded by default on the topic list, and when scrolling down to load more topics"
-    slow_topics_per_page: "The amount of topics per page on slow devices such as Android"
     site_contact_username: "All automated private messages will be from this user; if left blank the default System account will be used."
     send_welcome_message: "Send all new users a welcome private message with a quick start guide."
     suppress_reply_directly_below: "Don't show the expandable reply count on a post when there is only a single reply directly below this post."
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 9ca76a77c..1f58ffb90 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -667,7 +667,6 @@ es:
     post_menu_hidden_items: "Los elementos del menú a ocultar por defecto en el menú de cada post a menos que se haga clic en el botón para expandir las opciones."
     share_links: "Determina qué elementos aparecen en el cuadro de compartir y en qué orden"
     track_external_right_clicks: "Hacer seguimiento de los enlaces externos en los que se ha hecho clic con el botón derecho (ej: abrir en nueva pestaña) desactivado por defecto porque reescribe URLs"
-    topics_per_page: "Cuántos temas se cargan por defecto en la lista de temas y cuando se hace scroll hacia abajo para cargar más temas"
     site_contact_username: "Todos los mensajes privados automatizados serán de este usuario. Si es dejado en blanco, el la cuenta del Sistema por defecto será utilizada."
     send_welcome_message: "Enviar a todos los nuevos usuarios un mensaje privado de bienvenida con una guía rápida para comenzar."
     suppress_reply_directly_below: "No mostrar el contador de respuestas desplegable en un post si solo hay una única respuesta y está justamente debajo del post en cuestión."
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 60c005b55..8cf764064 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -667,7 +667,6 @@ fi:
     post_menu_hidden_items: "Piilotettavat painikkeet viestin valikosta, kunnes '...' klikataan."
     share_links: "Mitkä painikkeet näytetään Jaa-valikossa ja missä järjestyksessä."
     track_external_right_clicks: "Seuraa pois sivustolta vieviä linkkejä, jotka avataan hiiren oikealla näppäimellä (esim. avaa uudessa välilehdessä) oletuksena poistettu käytöstä, koska tämä kirjoittaa URL:n uudelleen"
-    topics_per_page: "Kuinka monta ketjua ladataan avattaessa ketjulista ja kerrallaan lisää vieritettäessä sivua alaspäin"
     site_contact_username: "Kaikki automaattiset yksityisviestit lähetetään tämän käyttäjän nimissä; jos jätetään tyhjäksi oletuksena on System-käyttäjä."
     send_welcome_message: "Lähetä kaikille uusille käyttäjille yksityinen tervetuliaisviesti, jossa on pikakäyttöopas."
     suppress_reply_directly_below: "Älä näytä vastausten lukumäärää viestissä, jos ainoa vastaus on seuraavassa viestissä."
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 8865bf953..b428a0110 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -662,7 +662,6 @@ fr:
     post_menu_hidden_items: "Les éléments du menu qui seront cachés par défaut jusqu’à extension du menu."
     share_links: "Choix des éléments qui doivent apparaître dans la fenêtre de partage, et leur ordre."
     track_external_right_clicks: "Suivi des clics sur les liens externes (ex: ouverture dans un nouvel onglet) désactivé par défaut car nécessite une ré-écriture de toutes les urls"
-    topics_per_page: "Combien de sujets seront chargés par défaut sur la liste des sujets et lors du défilement vers le bas pour charger des sujets supplémentaires"
     site_contact_username: "Tous les messages privés automatisés le seront depuis cet utilisateur; si non renseigné, le compte par défaut System sera utilisé."
     send_welcome_message: "Envoyer à tous les nouveaux utilisateurs un message privé avec un guide de démarrage rapide."
     suppress_reply_directly_below: "Ne pas afficher le panneau extensible des réponses d'un message quand la seule réponse est juste en dessous ce dernier."
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 77ff6eb1e..d01bc16e1 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -657,7 +657,6 @@ he:
     post_menu_hidden_items: "פריטי התפריט להסתרה כברירת מחדל בתפריט הפרסום, אלא אם כן נלחץ לחצן ההרחבה."
     share_links: "החלט אילו פריטים יופיעו בתיבת השיתוף, ובאיזה סדר."
     track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
-    topics_per_page: "כמה נושאים נטענים כברירת מחדל ברשימת הנושאים, ומתי גלילה למטה טוענת נושאים נוספים"
     site_contact_username: "כל המסרים האישיים האוטומטיים יהיו ממשתמש זה; אם תשאירו ריק, יעשה שימוש בחשבון ברירת המחדל של המערכת."
     send_welcome_message: "שלחו כל המשתמשים החדשים הודעת \"ברוכים הבאים\" פרטים עם הדרכה ראשונית כיצד להתחיל."
     suppress_reply_directly_below: "אל תציגו את סך התגובות המצטבר בפרסום כאשר ישנה תגובה ישירה אחת לפרסום זה."
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 22392cf9e..b1b8cb4bf 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -626,7 +626,6 @@ it:
     post_menu_hidden_items: "Le voci di menu da nascondere per difetto nel menu di composizione del messaggio, a meno che non vengano premuti i punti di sospensione per espanderle."
     share_links: "Determina quali elementi appaiono nella finestra di condivisione e in quale ordine."
     track_external_right_clicks: "Segui i collegamenti esterni sui quali viene fatto click destro (es: apri in una nuova tab). Disabilitato di default perché riscrive le URL"
-    topics_per_page: "Quanti argomenti vengono caricati per difetto nella lista di argomenti, e quando si scorre in basso per caricare altri argomenti"
     send_welcome_message: "Invia a tutti i nuovi utenti un messaggio di benvenuto con una guida di avvio rapido."
     topics_per_period_in_top_summary: "Numero di argomenti di punta mostrati nel riepilogo di default."
     show_email_on_profile: "Mostra l'email di un utente nel suo profilo (visibile solo a se stesso e allo staff)"
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index cae44c369..b031aaa9a 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -617,7 +617,6 @@ ko:
     post_menu: "게시물 메뉴에 어떤 사항들이 무슨 순서로 올라올지 결정합니다. 예: like(좋아요)|edit(수정)|flag(신고)|delete(삭제)|share(공유)|bookmark(북마크)|reply(답글)"
     share_links: "공유 다이얼로그에 어떤 아이템이 어떤 순서로 나올지 결정"
     track_external_right_clicks: "우클릭한 외부 링크를 추적한다 (에: 새 탭 열기) 이 설정을 위해선 해당 URL를 다시 써야하는 이유로 기본값은 비활성화이다."
-    topics_per_page: "토픽 리스트에서 기본으로 보여지는 토픽 수와 스크롤로 인해 더 많은 토픽들이 불려올 때의 수"
     send_welcome_message: "신규 사용자에게 가입 환영 메세지를 보냅니까?"
     suppress_reply_directly_below: "게시글의 바로 아래에 단 하나의 댓글만 있는 경우 '댓글 수'를 보여주지 않음"
     suppress_reply_directly_above: "단 하나의 댓글 위의 게시글이 하나 있는 상황에서 '~에 대한 댓글'을 보여주지 않음."
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index b1388bc4d..e74b611ea 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -640,7 +640,6 @@ pl_PL:
     post_menu: "Określ które elementy menu wpisu powinny być widoczne i w jakiej kolejności. Przykład like|edit|flag|delete|share|bookmark|reply"
     share_links: "Określ które elementy menu udostępniania powinny być widoczne i w jakiej kolejności. "
     track_external_right_clicks: "Śledź zewnętrzne linki kliknięte prawym klawiszem (np. otwierane w nowej zakładce). Domyślnie wyłączone, gdyż wymaga nadpisywania URLi."
-    topics_per_page: "Liczba tematów ładowanych domyślnie na liście wątków oraz przy doładowaniu wywołanym przewijaniem strony."
     site_contact_username: "Wszystkie automatycznie wysyłane wiadomości prywatne będą pochodzić od wskazanego tu użytkownika. Jeśli puste, zostanie użyte konto System. "
     topics_per_period_in_top_summary: "Liczba tematów wyświetlanych w domyślnym podsumowaniu najbardziej popularnych wątków"
     topics_per_period_in_top_page: "Liczba tematów wyświetlanych w widoku 'Pokaż więcej'  na ekranie popularnych wątków."
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 6226fd3ae..c203f3a87 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -725,8 +725,6 @@ ro:
     post_menu_hidden_items: "Meniul de elemente de ascuns din oficiu în meniul de postări numai dacă elipsa este activată prin click."
     share_links: "Determină ce elemente apar în dialogul distribuit şi în ce ordine."
     track_external_right_clicks: "Urmăreşte adresele externe ce sunt activate prin click-dreapta (ex: deschide în tab nou) dezactivate din oficiu fiindcă rescrie URL-uri"
-    topics_per_page: "Câte discuţii sunt încărcate din oficiu în lista de discuţii, şi când se face scroll pentru a încărca mai multe discuţii"
-    posts_per_page: "Câte postări sunt încărcate din oficiu într-o discuţie, şi când se face scroll pentru a încărca mai multe postări"
     site_contact_username: "Toate mesajele priovate automate trimise de forum vor fi de la acest utilizator; dacă este lăsat necompletat va fi folosit contul de sistem oficial."
     send_welcome_message: "Trimite tuturor utilizatorilor noi un mesaj privat de bun-venit şi un scurt ghid."
     suppress_reply_directly_below: "Nu arăta numărul expadabil de răspunsuri într-o postare când există doar un sigur răspuns sub acesta."
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 465b9f693..4fc4c0784 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -661,7 +661,6 @@ ru:
     post_menu_hidden_items: "Пункты меню действий над сообщением, которые должны быть спрятаны и появляться по нажатию на кнопку с троеточием."
     share_links: "Определите, какие элементы должны отображаться в окне  'Поделиться' и в какой последовательности."
     track_external_right_clicks: "Отслеживать внешние ссылки, открытые правой кнопкой мыши (например: открыть в новой вкладке), по умолчанию отключено, так как это перезаписывает пути"
-    topics_per_page: "Сколько тем показывать сразу в списках тем, и подгружать за один раз при прокручивании списка вниз."
     site_contact_username: "Все личные сообщения, отправляемые форумчанам автоматически, будут отправляться от имени этого пользователя. Если оставить пустым, то будет использован системный пользователь по-умолчанию - system."
     send_welcome_message: "Отправлять новым зарегистрировавшимся пользователям приватное сообщение с короткой инструкцией по возможностям форума."
     redirect_users_to_top_page: "Автоматически перенаправлять новых и давно отсутствующих пользователей к началу страницы."
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 0816981fd..50466ee4a 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -666,7 +666,6 @@ sq:
     post_menu_hidden_items: "The menu items to hide by default in the post menu unless an expansion ellipsis is clicked on."
     share_links: "Determine which items appear on the share dialog, and in what order."
     track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
-    topics_per_page: "How many topics are loaded by default on the topic list, and when scrolling down to load more topics"
     site_contact_username: "All automated private messages will be from this user; if left blank the default System account will be used."
     send_welcome_message: "Send all new users a welcome private message with a quick start guide."
     suppress_reply_directly_below: "Don't show the expandable reply count on a post when there is only a single reply directly below this post."
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 857fa6530..ec5f3a8b3 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -621,7 +621,6 @@ tr_TR:
     post_menu_hidden_items: "Gönderi menüsündeki maddeler, genişletme üç noktasına tıklanmadığı takdirde otomatik olarak gizlenir. "
     share_links: "Paylaşım penceresinde hangi maddelerin ne sırada gözükeceğini belirleyin."
     track_external_right_clicks: "URL'leri tekrar yazdığı için, sağ tıklanan dış bağlantıların (ör: yeni bir sekmede aç) takibi varsayılan ayarlarda devre dışı bırakılmıştır."
-    topics_per_page: "Konu listesinde gözüken ve daha fazla konu görmek için sayfa aşağı kaydırıldığında yüklenen konu sayısı"
     site_contact_username: "Tüm otomatik özel mesajlar bu kullanıcıdan gönderilecek; boş bırakılırsa varsayılan Sistem hesabı kullanılır. "
     send_welcome_message: "Tüm yeni kullanıcılara bir hoşgeldiniz özel mesajı ile beraber hızlı başlangıç kılavuzu gönderin."
     suppress_reply_directly_below: "Bu gönderinin direk altında sadece tek bir cevap varsa, gönderideki açılabilir cevap sayısı bölümünü gösterme."
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index f9b51ba5d..73fba2304 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -637,7 +637,6 @@ zh_CN:
     post_menu_hidden_items: "帖子菜单中默认隐藏的按钮，点击省略号后显示。"
     share_links: "决定分享对话框中出现的按钮及显示顺序。"
     track_external_right_clicks: "追踪外部链接的右键点击（例如：在浏览器新标签打开），缺省是禁用的，因为它会重写URL"
-    topics_per_page: "在主题列表页面，缺省载入多少个主题，以及滚动至什么时候载入更多主题"
     site_contact_username: "论坛给用户发送自动私信时使用的用户名；如果留空将使用默认的系统账户。"
     send_welcome_message: "给所有用户发送快速开始指导的私信"
     suppress_reply_directly_below: "当一个帖子只有一个回复时，不显示帖子回复数量。"
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 81c8c35ac..59f2cdb06 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -481,7 +481,6 @@ zh_TW:
     post_menu: "確定在文章功能表條包含哪些條目，以及排列順序。例如：like|edit|flag|delete|share|bookmark|reply"
     share_links: "決定在分享對話方塊裡顯示哪些項目、以什麼順序顯示。"
     track_external_right_clicks: "追蹤外部連結的右鍵點擊 ( 例如：開啟於瀏覽器的新頁面 )，預設是關閉的，因為它會重寫URLs"
-    topics_per_page: "預設在話題列表頁載入多少篇，然後捲軸下拉才會出現更多討論話題"
     send_welcome_message: "給所有的新用戶發送一個快速引導的私訊"
     topics_per_period_in_top_summary: "預設推薦話題的顯示數量"
     topics_per_period_in_top_page: "在展開 \"顯示更多\" 推薦話題列表的顯示數量"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 34e18a4ca..e2b3bae69 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -151,12 +151,6 @@ basic:
   fixed_category_positions:
     client: true
     default: false
-  topics_per_page:
-    default: 30
-    min: 1
-  slow_topics_per_page:
-    default: 15
-    min: 1
   show_subcategory_list:
     default: false
     client: true
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index f56d08a4f..63efb1aea 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -157,7 +157,7 @@ class TopicQuery
   protected
 
     def per_page_setting
-      @options[:slow_platform] ? SiteSetting.slow_topics_per_page : SiteSetting.topics_per_page
+      @options[:slow_platform] ? 30 : 15
     end
 
     def create_list(filter, options={}, topics = nil)