diff --git a/telldus-core/driver/libtelldus-core/DeviceNexa.cpp b/telldus-core/driver/libtelldus-core/DeviceNexa.cpp
index 3f672e37..6a03a60f 100644
--- a/telldus-core/driver/libtelldus-core/DeviceNexa.cpp
+++ b/telldus-core/driver/libtelldus-core/DeviceNexa.cpp
@@ -250,9 +250,6 @@ std::string DeviceNexa::getStringSelflearning(bool dim, unsigned char level) {
 }
 
 bool DeviceNexa::parameterMatches( const std::string &name, const std::string &value ) const {
-	if (value.length() == 0) {
-		return false;
-	}
 	if (name.compare("house") == 0) {
 		if (isSelflearning()) {
 			return intHouse == atoi(value.c_str());
diff --git a/telldus-core/driver/libtelldus-core/Manager.cpp b/telldus-core/driver/libtelldus-core/Manager.cpp
index 0cf516e6..bb64ffcc 100644
--- a/telldus-core/driver/libtelldus-core/Manager.cpp
+++ b/telldus-core/driver/libtelldus-core/Manager.cpp
@@ -523,6 +523,9 @@ void TelldusCore::Manager::processMessage(const std::string & message) {
 		}
 		bool found = true;
 		for (std::map<std::string, std::string>::const_iterator p_it = parameters.begin(); p_it != parameters.end(); ++p_it) {
+			if (p_it->second.length() == 0) {
+				continue;
+			}
 			if (!it->second->parameterMatches(p_it->first, p_it->second)) {
 				found = false;
 				break;