diff --git a/smart-hut/src/components/dashboard/devices/Device.js b/smart-hut/src/components/dashboard/devices/Device.js
index 41b0b16..43efc7f 100644
--- a/smart-hut/src/components/dashboard/devices/Device.js
+++ b/smart-hut/src/components/dashboard/devices/Device.js
@@ -157,7 +157,7 @@ class Device extends React.Component {
                 </Grid.Column>
               )}
             </Grid>
-            {this.props.stateOrDevice ? (
+            {this.props.stateOrDevice && this.props.tab === "Devices" ? (
               <DeviceSettingsModal
                 ref={this.modalRef}
                 id={this.props.stateOrDevice.id}