diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/MqttTopicFilterFactory.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/MqttTopicFilterFactory.java
index 9893f8cbef..98e472ba5c 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/MqttTopicFilterFactory.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/util/MqttTopicFilterFactory.java
@@ -36,7 +36,7 @@ public class MqttTopicFilterFactory {
             if (filter.contains("+") || filter.contains("#")) {
                 String regex;
                 if (filter.equals("#")) {
-                    regex = filter.replace("#", "^(?!/).+");
+                    regex = filter.replace("#", "\\S+");
                 } else {
                     regex = filter
                             .replace("\\", "\\\\")
diff --git a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/util/MqttTopicFilterFactoryTest.java b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/util/MqttTopicFilterFactoryTest.java
index f3a65bda14..2ec05fac78 100644
--- a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/util/MqttTopicFilterFactoryTest.java
+++ b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/util/MqttTopicFilterFactoryTest.java
@@ -30,9 +30,10 @@ public class MqttTopicFilterFactoryTest {
     private static String TEST_STR_1 = "Sensor/Temperature/House/48";
     private static String TEST_STR_2 = "Sensor/Temperature";
     private static String TEST_STR_3 = "Sensor/Temperature2/House/48";
-
-    private static String TEST_STR_4 = String.format("%s%n%s", "/Sensor/Temperature", "/House/48");
-    private static String TEST_STR_5 = "/" + TEST_STR_1;
+    private static String TEST_STR_4 = "/Sensor/Temperature2/House/48";
+    private static String TEST_STR_5 = String.format("%s%n%s", "/Sensor/Temperature", "/House/48");
+    private static String TEST_STR_6 = "";
+    private static String TEST_STR_7 = " ";
 
     @Test
     public void metadataCanBeUpdated() throws ScriptException {
@@ -58,8 +59,10 @@ public class MqttTopicFilterFactoryTest {
         assertTrue(filter.filter(TEST_STR_1));
         assertTrue(filter.filter(TEST_STR_2));
         assertTrue(filter.filter(TEST_STR_3));
-        assertFalse(filter.filter(TEST_STR_4));
+        assertTrue(filter.filter(TEST_STR_4));
         assertFalse(filter.filter(TEST_STR_5));
+        assertFalse(filter.filter(TEST_STR_6));
+        assertFalse(filter.filter(TEST_STR_7));
     }
 
 }