diff --git a/src/modules/demos.js b/src/modules/demos.js
index d578d2a..dcc4003 100644
--- a/src/modules/demos.js
+++ b/src/modules/demos.js
@@ -184,8 +184,8 @@ export function *watchEndDemoSession() {
     yield take(END_DEMO_SESSION);
     const demoState = yield select(demoSelector);
     try {
-      yield put(logoutSuccess());
       yield call(api.endDemo, demoState.guid);
+      yield put(logoutSuccess());
     }
     catch (error) {
       console.log('Error during logout', error);
diff --git a/src/routes/Dashboard/components/Map/PopUpCard/ShipmentCard/ShipmentCard.jsx b/src/routes/Dashboard/components/Map/PopUpCard/ShipmentCard/ShipmentCard.jsx
index 0f18f45..2cd32b1 100644
--- a/src/routes/Dashboard/components/Map/PopUpCard/ShipmentCard/ShipmentCard.jsx
+++ b/src/routes/Dashboard/components/Map/PopUpCard/ShipmentCard/ShipmentCard.jsx
@@ -100,8 +100,17 @@ export class ShipmentCard extends React.PureComponent {
               Current Weather
             </div>
             <div>
-              {currentLocation.weather ?
-               `${currentLocation.weather.observation.temp}° | ${currentLocation.weather.observation.wx_phrase}` :
+
+              {currentLocation.weather ? <div>
+                <img
+                  alt={currentLocation.weather.observation.wx_phrase}
+                  className={classes.weatherIcon}
+                  src={`/images/weather/${currentLocation.weather.observation.wx_icon}.png`}
+                />
+                {`${currentLocation.weather.observation.temp}
+                ° | ${currentLocation.weather.observation.wx_phrase}`}
+              </div>
+               :
                (<div style={{ textAlign: 'center' }}><LoadingSpinner size={60} /></div>)}
             </div>
           </div>