diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50aa2cb5..89065487 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,8 @@ NOTE: Add new changes BELOW THIS COMMENT.
 
 ### Fixed
 
+- Unnecessary validation call on the encryption page.
+- Missing version in the footer.
 - Panic caused by missing user-specific blocked services object in configuration
   file ([#7069]).
 - Tracking `/etc/hosts` file changes causing panics within particular
diff --git a/client/src/components/Settings/Encryption/index.tsx b/client/src/components/Settings/Encryption/index.tsx
index 4c15567b..b50a2257 100644
--- a/client/src/components/Settings/Encryption/index.tsx
+++ b/client/src/components/Settings/Encryption/index.tsx
@@ -38,7 +38,7 @@ class Encryption extends Component<EncryptionProps> {
     handleFormChange = debounce((values) => {
         const submitValues = this.getSubmitValues(values);
 
-        if (submitValues.enabled || submitValues.serve_plain_dns) {
+        if (submitValues.enabled) {
             this.props.validateTlsConfig(submitValues);
         }
     }, DEBOUNCE_TIMEOUT);
diff --git a/client/src/components/ui/Version.tsx b/client/src/components/ui/Version.tsx
index b37e156e..f01cfb02 100644
--- a/client/src/components/ui/Version.tsx
+++ b/client/src/components/ui/Version.tsx
@@ -12,7 +12,7 @@ const Version = () => {
     const dashboard = useSelector((state: RootState) => state.dashboard, shallowEqual);
     const install = useSelector((state: RootState) => state.install, shallowEqual);
 
-    if (!dashboard || !install) {
+    if (!dashboard && !install) {
         return null;
     }