diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index bb7273d..1223377 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -664,10 +664,14 @@ $(document).ready(function() {
 {% if config['EVENTSOURCE_SOURCE'] and not issue.private %}
 <script type="text/javascript"
   src="{{ url_for('static', filename='issue_ev.js') }}"></script>
+{% endif %}
+
 
 <script type="text/javascript">
 var source = null;
 var sse = true;
+
+{% if config['EVENTSOURCE_SOURCE'] and not issue.private %}
 if (!!window.EventSource) {
   source = new EventSource('{{ config["EVENTSOURCE_SOURCE"]
     + request.script_root + request.path }}');
@@ -714,6 +718,10 @@ source.addEventListener('message', function(e) {
 
   }, false);
 
+{% else %}
+sse = false;
+{% endif %}
+
 {% if g.authenticated and form %}
 function set_ui_for_comment(setting){
   if (setting == false) {
@@ -774,9 +782,9 @@ function try_async_comment(form) {
 {% endif %}
 
 </script>
-{% endif %}
-<script type="text/javascript">
 
+
+<script type="text/javascript">
 {% if g.authenticated and g.repo_user %}
 function take_issue(){
   var _url = "{{ url_for('api_ns.api_assign_issue',
diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 68d55a0..500590c 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -1688,11 +1688,11 @@ $(document).on("mouseleave", "td.cell2", function() {
 </script>
 
 
-{% if config['EVENTSOURCE_SOURCE'] and pull_request %}
 
 <script type="text/javascript">
 var source = null;
 var sse = true;
+{% if config['EVENTSOURCE_SOURCE'] and pull_request %}
 if (!!window.EventSource) {
   source = new EventSource('{{ config["EVENTSOURCE_SOURCE"]
     + request.script_root + request.path }}');
@@ -1715,8 +1715,10 @@ source.addEventListener('message', function(e) {
   setup_edit_btns();
   setup_reply_btns();
   }, false);
-</script>
+{% else %}
+sse = false;
 {% endif %}
+</script>
 
 {% if repo.quick_replies %}
 <script type="text/javascript" src="{{ url_for('static', filename='quick_reply.js') }}"></script>