diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index cce1b9b86..c147ee51f 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -453,12 +453,11 @@ FW_answerCall($)
       next if($arg !~ m/^$k/ || $h !~ m/HASH/ || !$h->{FUNC});
       no strict "refs";
       #Returns undef if it already sent a HTTP header
-      ($FW_RETTYPE, $FW_RET) = &{$h->{FUNC}}($arg);
+      my $localType;
+      ($localType, $FW_RET) = &{$h->{FUNC}}($arg);
       use strict "refs";
-      if(!$FW_RET) {
-        $FW_RETTYPE = "text/html; charset=$FW_encoding";
-        last;
-      }
+      last if($FW_RET && $FW_RET eq "continue"); # Continue displaying the data
+      $FW_RETTYPE = $localType;
       return defined($FW_RETTYPE) ? 0 : -1;
     }
   }
diff --git a/fhem/FHEM/98_weblink.pm b/fhem/FHEM/98_weblink.pm
index 6103c609a..95a32c596 100755
--- a/fhem/FHEM/98_weblink.pm
+++ b/fhem/FHEM/98_weblink.pm
@@ -391,13 +391,13 @@ weblink_WriteGplot($)
   for(my $i=0; $i <= 8; $i++) {
     $hasTl = 1 if($FW_webArgs{"title_$i"});
   }
-  return if(!$hasTl);
+  return (undef, "continue") if(!$hasTl);
 
   my $fName = $FW_webArgs{gplotName};
-  return if(!$fName);
+  return (undef, "continue") if(!$fName);
   if(!open(FH, ">$fName")) {
     Log 1, "weblink_WriteGplot: Can't write $fName";
-    return;
+    return (undef, "continue");
   }
   print FH "# Created by FHEMWEB, ".TimeNow()."\n";
   print FH "set terminal png transparent size <SIZE> crop\n";
@@ -440,6 +440,7 @@ weblink_WriteGplot($)
   #foreach my $k (sort keys %FW_webArgs) {
   #  Log 1, "$k: $FW_webArgs{$k}";
   #}
+  return (undef, "continue");
 }
 
 1;