diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 b/app/assets/javascripts/discourse/widgets/topic-map.js.es6
index 00d6f7e93e4..16c78eaa23a 100644
--- a/app/assets/javascripts/discourse/widgets/topic-map.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-map.js.es6
@@ -185,8 +185,8 @@ export default createWidget('topic-map', {
   tagName: 'div.topic-map',
   buildKey: attrs => `topic-map-${attrs.id}`,
 
-  defaultState() {
-    return { collapsed: true };
+  defaultState(attrs) {
+    return { collapsed: attrs.topicPostsCount < 50 };
   },
 
   html(attrs, state) {
diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6
index 47f56cdfe67..c05b2500e5e 100644
--- a/app/assets/javascripts/discourse/widgets/widget.js.es6
+++ b/app/assets/javascripts/discourse/widgets/widget.js.es6
@@ -140,7 +140,7 @@ export default class Widget {
     if (prev && prev.state) {
       this.state = prev.state;
     } else {
-      this.state = this.defaultState();
+      this.state = this.defaultState(this.attrs, this.state);
     }
 
     // Sometimes we pass state down from the parent