diff --git a/public/helpers/class-bigbluebutton-tokens-helper.php b/public/helpers/class-bigbluebutton-tokens-helper.php
index 7835b61..422628a 100644
--- a/public/helpers/class-bigbluebutton-tokens-helper.php
+++ b/public/helpers/class-bigbluebutton-tokens-helper.php
@@ -46,8 +46,8 @@ public static function get_token_string_from_atts( $atts ) {
 			} else {
 				if ( 'token' == substr( $param, 0, 5 ) ) {
 					$param = substr( $param, 5 );
+					$tokens_string .= ',' . $param;
 				}
-				$tokens_string .= ',' . $param;
 			}
 		}
 		return $tokens_string;