diff --git a/formats/incoming/SRF_Incoming.php b/formats/incoming/SRF_Incoming.php
index 831caa29..7ce58451 100644
--- a/formats/incoming/SRF_Incoming.php
+++ b/formats/incoming/SRF_Incoming.php
@@ -137,19 +137,24 @@ protected function getFormatOutput( array $data ) {
 			$result = implode( $this->params['sep'], array_keys( $data ) );
 		}
 
-		// Beautify class selector
-		$class = $this->params['template'] ? 'srf-incoming ' . str_replace(
+		if ( $this->params['template'] ) {
+			// Beautify class selector
+			$class = 'srf-incoming ' . str_replace(
 				" ",
 				"-",
 				$this->params['template']
-			) : 'srf-incoming';
-
-		// Output
-		return Html::rawElement(
-			'div',
-			[ 'class' => $class ],
-			$result
-		);
+			);
+
+			// Output
+			return Html::rawElement(
+				'div',
+				[ 'class' => $class ],
+				$result
+			);
+		} else {
+			// Output without template
+			return $result;
+		}
 	}
 
 	/**