diff --git a/_includes/sessions-modals.html b/_includes/sessions-modals.html
index ab3dabf..d26da52 100644
--- a/_includes/sessions-modals.html
+++ b/_includes/sessions-modals.html
@@ -12,8 +12,12 @@
 							<div class="close-mask" data-dismiss="modal"></div>
 						</div>
 						<h4>{{ session.title }}</h4>
+						{% if session.language != null %}
 						<span class="theme-metadata"><span class="caption">Language: </span>{{ session.language }}</span>
+						{% endif %}
+						{% if session.complexity != null %}
 						<span class="theme-metadata"><span class="caption">Complexity: </span>{{ session.complexity }}</span>
+						{% endif %}
 						{% if session.video %}
 						<div class="theme-video embed-responsive embed-responsive-16by9">
 						    <iframe class="embed-responsive-item" src="{{ session.video }}"></iframe>
diff --git a/_includes/speakers-modals.html b/_includes/speakers-modals.html
index 44e22e0..4e3e115 100644
--- a/_includes/speakers-modals.html
+++ b/_includes/speakers-modals.html
@@ -17,8 +17,12 @@
 								{% for session_speaker in session.speakers %}
 									{% if session_speaker == speaker.id %}
 										<h4>{{ session.title }}</h4>
+										{% if session.language != null %}
 										<span class="theme-metadata"><span class="caption">Language: </span>{{ session.language }}</span>
+										{% endif %}
+										{% if session.complexity != null %}
 										<span class="theme-metadata"><span class="caption">Complexity: </span>{{ session.complexity }}</span>
+										{% endif %}
 										{% if session.video %}
 										<div class="theme-video embed-responsive embed-responsive-16by9">
 										    <iframe class="embed-responsive-item" src="{{ session.video }}"></iframe>