diff --git a/system/includes/functions.php b/system/includes/functions.php
index 3bae2103..281418f9 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -909,7 +909,7 @@ function get_teaser($text)
 {
     $teaserType = config('teaser.type');
 
-    if (strlen(strip_tags($text)) < config('teaser.char') || $teaserType === 'full') {
+    if ($teaserType === 'full') {
         echo $text;
     } else {
         $string = preg_replace('/\s\s+/', ' ', strip_tags($text));
diff --git a/themes/clean/main.html.php b/themes/clean/main.html.php
index e9a76bed..2e2c3844 100644
--- a/themes/clean/main.html.php
+++ b/themes/clean/main.html.php
@@ -36,7 +36,9 @@
             <?php } ?>
             <div class="teaser-body" itemprop="articleBody">
                 <?php echo get_thumbnail($p->body) ?>
-                <p><?php echo get_teaser($p->body) ?>... <a href="<?php echo $p->url;?>#more">more</a></p>
+                <p><?php echo get_teaser($p->body) ?>
+                    <?php if (config('teaser.type') === 'trimmed'):?> ... <a href="<?php echo $p->url;?>#more">more</a><?php endif;?>
+                </p>
             </div>
         </div>
     </div>
diff --git a/themes/default/main.html.php b/themes/default/main.html.php
index e9a76bed..2e2c3844 100644
--- a/themes/default/main.html.php
+++ b/themes/default/main.html.php
@@ -36,7 +36,9 @@
             <?php } ?>
             <div class="teaser-body" itemprop="articleBody">
                 <?php echo get_thumbnail($p->body) ?>
-                <p><?php echo get_teaser($p->body) ?>... <a href="<?php echo $p->url;?>#more">more</a></p>
+                <p><?php echo get_teaser($p->body) ?>
+                    <?php if (config('teaser.type') === 'trimmed'):?> ... <a href="<?php echo $p->url;?>#more">more</a><?php endif;?>
+                </p>
             </div>
         </div>
     </div>
diff --git a/themes/logs/main.html.php b/themes/logs/main.html.php
index 60453157..4c2d83fe 100644
--- a/themes/logs/main.html.php
+++ b/themes/logs/main.html.php
@@ -36,7 +36,9 @@
             <?php } ?>
             <div class="teaser-body" itemprop="articleBody">
                 <?php echo get_thumbnail($p->body) ?>
-                <p><?php echo get_teaser($p->body) ?>... <a href="<?php echo $p->url;?>#more">more</a></p>
+                <p><?php echo get_teaser($p->body) ?>
+                    <?php if (config('teaser.type') === 'trimmed'):?> ... <a href="<?php echo $p->url;?>#more">more</a><?php endif;?>
+                </p>
             </div>
         </div>
     </div>