diff --git a/managed/ui/src/components/config/OnPrem/OnPremConfiguration.scss b/managed/ui/src/components/config/OnPrem/OnPremConfiguration.scss
index ef85aaed47e2..d3b158a2bb71 100644
--- a/managed/ui/src/components/config/OnPrem/OnPremConfiguration.scss
+++ b/managed/ui/src/components/config/OnPrem/OnPremConfiguration.scss
@@ -112,7 +112,6 @@
 }
 
 .provider-task-progress-container {
-  border: 1px solid #d3d3d3;
   padding: 6px 8px;
   width: 100%;
 }
diff --git a/managed/ui/src/components/universes/UniverseDetail/UniverseDetail.js b/managed/ui/src/components/universes/UniverseDetail/UniverseDetail.js
index cb2712d849e5..e6fd2176babb 100644
--- a/managed/ui/src/components/universes/UniverseDetail/UniverseDetail.js
+++ b/managed/ui/src/components/universes/UniverseDetail/UniverseDetail.js
@@ -76,11 +76,11 @@ class UniverseDetail extends Component {
     }
   }
 
-  componentDidUpdate(prevProps, prevState, snapshot) {
-    const { universe: { currentUniverse } } = this.props;
+  componentDidUpdate(prevProps) {
+    const { universe: { currentUniverse }, universeTables } = this.props;
     if (getPromiseState(currentUniverse).isSuccess() &&
         !getPromiseState(prevProps.universe.currentUniverse).isSuccess()) {
-      if (hasLiveNodes(currentUniverse.data)) {
+      if (hasLiveNodes(currentUniverse.data) && !universeTables.length) {
         this.props.fetchUniverseTables(currentUniverse.data.universeUUID);
       }
     }
diff --git a/managed/ui/src/components/universes/UniverseDetail/UniverseDetailContainer.js b/managed/ui/src/components/universes/UniverseDetail/UniverseDetailContainer.js
index 157f3e73124c..6e8a52ce2267 100644
--- a/managed/ui/src/components/universes/UniverseDetail/UniverseDetailContainer.js
+++ b/managed/ui/src/components/universes/UniverseDetail/UniverseDetailContainer.js
@@ -126,6 +126,7 @@ function mapStateToProps(state, ownProps) {
     customer: state.customer,
     universe: state.universe,
     tasks: state.tasks,
+    universeTables: state.tables.universeTablesList,
     modal: state.modal,
     providers: state.cloud.providers,
     updateAvailable: isUpdateAvailable(state)