diff --git a/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6 b/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6
index cb24154..5d16b57 100644
--- a/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6
+++ b/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6
@@ -102,8 +102,9 @@ function initializeWithApi(api) {
       if (postModel) {
         const topic = postModel.get('topic');
         if (topic.get('accepted_answer')) {
+          const hasExcerpt = !!topic.get('accepted_answer').excerpt;
 
-          var rawhtml = `
+          const withExcerpt = `
             <aside class='quote' data-post="${topic.get('accepted_answer').post_number}" data-topic="${topic.get('id')}">
               <div class='title'>
                 ${topic.get('acceptedAnswerHtml')} <div class="quote-controls"><\/div>
@@ -113,7 +114,14 @@ function initializeWithApi(api) {
               </blockquote>
             </aside>`;
 
-          var cooked = new PostCooked({cooked:rawhtml});
+          const withoutExcerpt = `
+            <aside class='quote'>
+              <div class='title title-only'>
+                ${topic.get('acceptedAnswerHtml')}
+              </div>
+            </aside>`;
+
+          var cooked = new PostCooked({ cooked: hasExcerpt ? withExcerpt : withoutExcerpt });
 
           var html = cooked.init();
 
diff --git a/assets/stylesheets/solutions.scss b/assets/stylesheets/solutions.scss
index 74dcccd..c756ee7 100644
--- a/assets/stylesheets/solutions.scss
+++ b/assets/stylesheets/solutions.scss
@@ -38,3 +38,7 @@
   //border-top: 1px solid #ddd;
   //background-color: #E9FFE0;
 }
+
+aside.quote .title.title-only {
+  padding: 12px;
+}
diff --git a/plugin.rb b/plugin.rb
index 58d878e..e0cfa83 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -250,7 +250,11 @@ SQL
         .first
 
       if postInfo
-        postInfo[2] = PrettyText.excerpt(postInfo[2], SiteSetting.solved_quote_length)
+        postInfo[2] = if SiteSetting.solved_quote_length > 0
+                        PrettyText.excerpt(postInfo[2], SiteSetting.solved_quote_length)
+                      else
+                        nil
+                      end
         return postInfo
       end
     end