diff --git a/client/src/actions/index.js b/client/src/actions/index.js
index 30527245..be4e4d7e 100644
--- a/client/src/actions/index.js
+++ b/client/src/actions/index.js
@@ -683,6 +683,7 @@ export const setTlsConfig = config => async (dispatch) => {
         await apiClient.setTlsConfig(values);
         dispatch(setTlsConfigSuccess(config));
         dispatch(addSuccessToast('encryption_config_saved'));
+        dispatch(getTlsStatus());
     } catch (error) {
         dispatch(addErrorToast({ error }));
         dispatch(setTlsConfigFailure());
diff --git a/client/src/components/Settings/Encryption/index.js b/client/src/components/Settings/Encryption/index.js
index e554cc6f..0b67dfe9 100644
--- a/client/src/components/Settings/Encryption/index.js
+++ b/client/src/components/Settings/Encryption/index.js
@@ -22,7 +22,7 @@ class Encryption extends Component {
 
         return (
             <div className="encryption">
-                {encryption && !encryption.processing &&
+                {encryption &&
                     <Card
                         title={t('encryption_title')}
                         subtitle={t('encryption_desc')}
diff --git a/client/src/reducers/index.js b/client/src/reducers/index.js
index b80f7f37..fa86b4af 100644
--- a/client/src/reducers/index.js
+++ b/client/src/reducers/index.js
@@ -327,6 +327,8 @@ const encryption = handleActions({
 }, {
     processing: true,
     processingConfig: false,
+    status_cert: '',
+    status_key: '',
 });
 
 export default combineReducers({