diff --git a/src/app/Mappings/components/MappingBuilder/MappingBuilder.tsx b/src/app/Mappings/components/MappingBuilder/MappingBuilder.tsx
index 1d4f2ab1d..7d66411ec 100644
--- a/src/app/Mappings/components/MappingBuilder/MappingBuilder.tsx
+++ b/src/app/Mappings/components/MappingBuilder/MappingBuilder.tsx
@@ -42,18 +42,6 @@ export const MappingBuilder: React.FunctionComponent<IMappingBuilderProps> = ({
   setBuilderItems,
   isWizardMode = false,
 }: IMappingBuilderProps) => {
-  const messageSelectBoth = 'You must select a source and target before adding another mapping.';
-  const messageExhausted = `All source ${
-    mappingType === MappingType.Network ? 'networks' : 'datastores'
-  } have been mapped.`;
-
-  const getTooltipContent = () => {
-    if (builderItems.length === availableSources.length) {
-      return messageExhausted;
-    }
-    return messageSelectBoth;
-  };
-
   const reset = () => setBuilderItems([{ source: null, target: null, highlight: false }]);
   const isReset = builderItems.length === 1 && !builderItems[0].source && !builderItems[0].target;
   const addEmptyItem = () =>
@@ -169,28 +157,26 @@ export const MappingBuilder: React.FunctionComponent<IMappingBuilderProps> = ({
           justifyContent={{ default: 'justifyContentCenter' }}
           spaceItems={{ default: 'spaceItemsMd' }}
         >
-          <ConditionalTooltip
-            isTooltipEnabled={
-              !builderItems.every((item) => item.source && item.target) ||
-              builderItems.length === availableSources.length
-            }
-            content={getTooltipContent()}
-            position="bottom"
-          >
-            <div>
-              <Button
-                isDisabled={
-                  !builderItems.every((item) => item.source && item.target) ||
-                  builderItems.length === availableSources.length
-                }
-                variant="secondary"
-                icon={<PlusCircleIcon />}
-                onClick={addEmptyItem}
-              >
-                Add
-              </Button>
-            </div>
-          </ConditionalTooltip>
+          {builderItems.every((item) => item.source && item.target) ? (
+            <ConditionalTooltip
+              isTooltipEnabled={builderItems.length === availableSources.length}
+              content={`All source ${
+                mappingType === MappingType.Network ? 'networks' : 'datastores'
+              } have been mapped.`}
+              position="bottom"
+            >
+              <div>
+                <Button
+                  isDisabled={builderItems.length === availableSources.length}
+                  variant="secondary"
+                  icon={<PlusCircleIcon />}
+                  onClick={addEmptyItem}
+                >
+                  Add
+                </Button>
+              </div>
+            </ConditionalTooltip>
+          ) : null}
           <Button variant="secondary" onClick={reset} isDisabled={isReset}>
             Remove all
           </Button>
diff --git a/src/app/Providers/HostsPage.tsx b/src/app/Providers/HostsPage.tsx
index b1ce54be7..01484ef16 100644
--- a/src/app/Providers/HostsPage.tsx
+++ b/src/app/Providers/HostsPage.tsx
@@ -56,7 +56,7 @@ export const HostsPage: React.FunctionComponent = () => {
         </Level>
         <Level className={spacing.mtLg}>
           <LevelItem>
-            <Title headingLevel="h1">Hosts - {match?.params.providerName}</Title>
+            <Title headingLevel="h1">Hosts</Title>
           </LevelItem>
         </Level>
       </PageSection>