diff --git a/components/mmplugin/signalindicator.cpp b/components/mmplugin/signalindicator.cpp
index 9fa2d174..b5b3de46 100644
--- a/components/mmplugin/signalindicator.cpp
+++ b/components/mmplugin/signalindicator.cpp
@@ -66,10 +66,7 @@ bool SignalIndicator::simLocked() const
 
 bool SignalIndicator::simEmpty() const
 {
-    if (!m_modemDevice) {
-        return false;
-    }
-    return m_modemDevice && m_modemDevice->sim() && m_modemDevice->sim()->uni() == QStringLiteral("/");
+    return !m_modemDevice || !m_modemDevice->sim() || (m_modemDevice->sim()->uni() == QStringLiteral("/"));
 }
 
 bool SignalIndicator::mobileDataSupported() const
diff --git a/components/mobileshell/qml/dataproviders/SignalStrengthProvider.qml b/components/mobileshell/qml/dataproviders/SignalStrengthProvider.qml
index 3b2c08f3..bdef18ce 100644
--- a/components/mobileshell/qml/dataproviders/SignalStrengthProvider.qml
+++ b/components/mobileshell/qml/dataproviders/SignalStrengthProvider.qml
@@ -15,8 +15,7 @@ QtObject {
 
     property string icon: "network-mobile-" + Math.floor(SignalIndicator.strength / 20) * 20
     
-    property string label: !SignalIndicator.available ? ""
-                         : SignalIndicator.simLocked ? i18n("SIM Locked") : SignalIndicator.name
+    property string label: SignalIndicator.simLocked ? i18n("SIM Locked") : SignalIndicator.name
                          
     property bool showIndicator: SignalIndicator.modemAvailable
 }