diff --git a/config/main.py b/config/main.py
index 0a83b84d03..79d0284c83 100644
--- a/config/main.py
+++ b/config/main.py
@@ -1673,7 +1673,7 @@ def gather_session_info(session_info, policer, queue, src_port, direction):
     if policer:
         session_info['policer'] = policer
 
-    if queue:
+    if queue is not None:
         session_info['queue'] = queue
 
     if src_port:
@@ -1699,7 +1699,7 @@ def add_erspan(session_name, src_ip, dst_ip, dscp, ttl, gre_type, queue, policer
             "ttl": ttl
             }
 
-    if gre_type:
+    if gre_type is not None:
         session_info['gre_type'] = gre_type
 
     session_info = gather_session_info(session_info, policer, queue, src_port, direction)
diff --git a/tests/config_mirror_session_test.py b/tests/config_mirror_session_test.py
index 883faea1ac..69cce20089 100644
--- a/tests/config_mirror_session_test.py
+++ b/tests/config_mirror_session_test.py
@@ -68,6 +68,12 @@ def test_mirror_session_add():
         mocked.assert_called_with("test_session", "100.1.1.1", "2.2.2.2", 8, 63, 10, 100, None)
 
 
+        result = runner.invoke(
+                config.config.commands["mirror_session"].commands["add"],
+                ["test_session", "100.1.1.1", "2.2.2.2", "8", "63", "0", "0"])
+
+        mocked.assert_called_with("test_session", "100.1.1.1", "2.2.2.2", 8, 63, 0, 0, None)
+
 
 def test_mirror_session_erspan_add():
     runner = CliRunner()
@@ -129,6 +135,12 @@ def test_mirror_session_erspan_add():
 
         mocked.assert_called_with("test_session", "100.1.1.1", "2.2.2.2", 8, 63, 10, 100, None, None, None)
 
+        result = runner.invoke(
+                config.config.commands["mirror_session"].commands["erspan"].commands["add"],
+                ["test_session", "100.1.1.1", "2.2.2.2", "8", "63", "0", "0"])
+
+        mocked.assert_called_with("test_session", "100.1.1.1", "2.2.2.2", 8, 63, 0, 0, None, None, None)
+
 
 def test_mirror_session_span_add():
     runner = CliRunner()
@@ -144,7 +156,13 @@ def test_mirror_session_span_add():
     with mock.patch('config.main.add_span') as mocked:
         result = runner.invoke(
                 config.config.commands["mirror_session"].commands["span"].commands["add"],
-                ["test_session", "Ethernet0", "Ethernet4", "rx", "100"])
+                ["test_session", "Ethernet8", "Ethernet4", "tx", "100"])
+        
+        mocked.assert_called_with("test_session", "Ethernet8", "Ethernet4", "tx", 100, None)
+
+        result = runner.invoke(
+                config.config.commands["mirror_session"].commands["span"].commands["add"],
+                ["test_session", "Ethernet0", "Ethernet4", "rx", "0"])
 
-        mocked.assert_called_with("test_session", "Ethernet0", "Ethernet4", "rx", 100, None)
+        mocked.assert_called_with("test_session", "Ethernet0", "Ethernet4", "rx", 0, None)