diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
index d6cb62939deb1..615db4fdf92c1 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
@@ -20,7 +20,6 @@ import React, { FormEvent } from 'react';
 import { SupersetTheme, JsonObject, t } from '@superset-ui/core';
 import { InputProps } from 'antd/lib/input';
 import { Switch } from 'src/common/components';
-import { Tooltip } from 'src/components/Tooltip';
 import InfoTooltip from 'src/components/InfoTooltip';
 import ValidatedInput from 'src/components/Form/LabeledErrorBoundInput';
 import {
@@ -180,23 +179,21 @@ const forceSSLField = ({
   sslForced,
 }: FieldPropTypes) => (
   <div css={(theme: SupersetTheme) => infoTooltip(theme)}>
-    <Tooltip title={t('SSL is required for Preset')}>
-      <Switch
-        disabled={sslForced && !isEditMode}
-        checked={db?.parameters?.encryption || sslForced}
-        onChange={changed => {
-          changeMethods.onParametersChange({
-            target: {
-              type: 'toggle',
-              name: 'encryption',
-              checked: true,
-              value: changed,
-            },
-          });
-        }}
-      />
-      <span css={toggleStyle}>SSL</span>
-    </Tooltip>
+    <Switch
+      disabled={sslForced && !isEditMode}
+      checked={db?.parameters?.encryption || sslForced}
+      onChange={changed => {
+        changeMethods.onParametersChange({
+          target: {
+            type: 'toggle',
+            name: 'encryption',
+            checked: true,
+            value: changed,
+          },
+        });
+      }}
+    />
+    <span css={toggleStyle}>SSL</span>
     <InfoTooltip
       tooltip={t('SSL will be enabled in the database connection')}
       placement="bottomRight"
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts
index 9b3128046c9e9..c014fb3794e90 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts
@@ -96,7 +96,7 @@ export const antDModalNoPaddingStyles = css`
 export const infoTooltip = (theme: SupersetTheme) => css`
   svg {
     vertical-align: bottom;
-    margin-bottom: ${theme.gridUnit * 0.5}px;
+    margin-bottom: ${theme.gridUnit * 0.25}px;
   }
 `;