diff --git a/settings/js/personal.js b/settings/js/personal.js
index 302906702b..314c57d8f7 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -335,6 +335,10 @@ $(document).ready(function () {
 			cert: row.data('name')
 		});
 		row.remove();
+
+		if ($('#sslCertificate > tbody > tr').length === 0) {
+			$('#sslCertificate').hide();
+		}
 		return true;
 	});
 
@@ -362,12 +366,17 @@ $(document).ready(function () {
 			));
 
 			$('#sslCertificate tbody').append(row);
+			$('#sslCertificate').show();
 		}
 	});
 
 	$('#rootcert_import_button').click(function () {
 		$('#rootcert_import').click();
 	});
+
+	if ($('#sslCertificate > tbody > tr').length === 0) {
+		$('#sslCertificate').hide();
+	}
 });
 
 OC.Encryption = {