diff --git a/src/routes/safe/components/Settings/RemoveSafeModal/index.jsx b/src/routes/safe/components/Settings/RemoveSafeModal/index.jsx
index 324d0078..f59cdd2c 100644
--- a/src/routes/safe/components/Settings/RemoveSafeModal/index.jsx
+++ b/src/routes/safe/components/Settings/RemoveSafeModal/index.jsx
@@ -51,7 +51,7 @@ const RemoveSafeComponent = ({
     open={isOpen}
   >
     <Row align="center" grow className={classes.heading}>
-      <Paragraph className={classes.manage} noMargin weight="bolder" >
+      <Paragraph className={classes.manage} noMargin weight="bolder">
           Remove Safe
       </Paragraph>
       <IconButton onClick={onClose} disableRipple>
@@ -84,7 +84,8 @@ const RemoveSafeComponent = ({
       <Row className={classes.description}>
         <Paragraph noMargin>
             Removing a Safe only removes it from your interface.
-            <b>It does not delete the Safe</b>.
+          <b>It does not delete the Safe</b>
+.
             You can always add it back using the Safe's address.
         </Paragraph>
       </Row>
diff --git a/src/routes/safe/container/index.jsx b/src/routes/safe/container/index.jsx
index cf6c8378..af7d0a4e 100644
--- a/src/routes/safe/container/index.jsx
+++ b/src/routes/safe/container/index.jsx
@@ -29,8 +29,9 @@ class SafeView extends React.Component<Props> {
 
   componentDidUpdate(prevProps) {
     const { activeTokens } = this.props
+    const oldActiveTokensSize = prevProps.activeTokens.size
 
-    if (activeTokens.size > prevProps.activeTokens.size) {
+    if (oldActiveTokensSize > 0 && activeTokens.size > oldActiveTokensSize) {
       this.checkForUpdates()
     }
   }