diff --git a/client/src/components/loading-spinner/loading-spinner.component.jsx b/client/src/components/loading-spinner/loading-spinner.component.jsx
index 325bbe17a..7e172b1f0 100644
--- a/client/src/components/loading-spinner/loading-spinner.component.jsx
+++ b/client/src/components/loading-spinner/loading-spinner.component.jsx
@@ -12,9 +12,10 @@ export default function LoadingSpinner({ loading = true, message, ...props }) {
           position: "relative",
           alignContent: "center"
         }}
+        // TODO: Client Update - if anything funky happens check this out
+        {...props.children ? { tip: message ? message : null } : {}}
         delay={200}
         // TODO: Client Update - tip only works when there are actually children, and this component is used in a lot of places where there are no children
-        // tip={message ? message : null}
       >
         {props.children}
       </Spin>