diff --git a/problem_builder/templates/html/tip_choice_group.html b/problem_builder/templates/html/tip_choice_group.html
index 7324c0b8..94a9dfb8 100644
--- a/problem_builder/templates/html/tip_choice_group.html
+++ b/problem_builder/templates/html/tip_choice_group.html
@@ -1,6 +1,8 @@
-<div class="tip-choice-group">
-  {% for tip_html in tips_html %}
-    {{ tip_html|safe }}
-  {% endfor %}
-</div>
-<button aria-label="close" class="close icon-remove-sign fa fa-times-circle">&times;</button>
+{% if tips_html %}
+  <div class="tip-choice-group">
+    {% for tip_html in tips_html %}
+      {{ tip_html|safe }}
+    {% endfor %}
+  </div>
+  <button aria-label="close" class="close icon-remove-sign fa fa-times-circle">&times;</button>
+{% endif %}
diff --git a/setup.py b/setup.py
index 3aeae709..dc3c413d 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@
 
 # Constants #########################################################
 
-VERSION = '3.4.16'
+VERSION = '3.4.17'
 
 # Functions #########################################################