diff --git a/templates/solar-pogodbe.html b/templates/solar-pogodbe.html
index 977a93b..2534ac4 100644
--- a/templates/solar-pogodbe.html
+++ b/templates/solar-pogodbe.html
@@ -55,7 +55,7 @@
                 <h2>Sodelujoči</h2>
             </div>
         </div>-->
-        <div class="row">
+        <div class="row" id="my_dataviz_title">
             <div class="col-12">
                 <h2>Število oddaj na uporabnika</h2>
             </div>
@@ -112,6 +112,7 @@
     // Parse the Data
     d3.json("/topuploads-institution/{{institution_id}}").then(function(jsondata) {
         if(Object.keys(jsondata).length < 1) {
+            document.getElementById("my_dataviz_title").remove();
             return;
         }
         data = [];
diff --git a/templates/solar-zgodovina.html b/templates/solar-zgodovina.html
index ce7b343..b7fdb24 100644
--- a/templates/solar-zgodovina.html
+++ b/templates/solar-zgodovina.html
@@ -98,7 +98,13 @@
         }%}
 
 
-
+        {% if upload_history|length == 0 %}
+        <div class="row">
+            <div class="col-6">
+                <p>Zgodovina sodelovanja je trenutno še prazna.</p>
+            </div>
+        </div>
+        {% endif %}
         {% for item in upload_history %}
             {% set item_values = [] %}
             {% if institution_names[loop.index - 1] %}