diff --git a/src/channel/traffic/TrafficChannelManager.java b/src/channel/traffic/TrafficChannelManager.java
index 1a706cf0..16cdec10 100644
--- a/src/channel/traffic/TrafficChannelManager.java
+++ b/src/channel/traffic/TrafficChannelManager.java
@@ -84,8 +84,6 @@ public class TrafficChannelManager extends Module implements ICallEventProvider,
      * @param system label to use to describe the system
      * @param site label to use to describe the site
      * @param aliasListName designated for the channel
-     * @param trafficChannelTimeout - millisecond call timer limit used when an
-     * end of call signalling event is not decoded.
      * @param trafficChannelPoolSize - maximum number of allocated traffic channels
      * in the pool
      */
@@ -96,7 +94,6 @@ public class TrafficChannelManager extends Module implements ICallEventProvider,
                                  String system,
                                  String site,
                                  String aliasListName,
-                                 long trafficChannelTimeout,
                                  int trafficChannelPoolSize)
     {
         mChannelModel = channelModel;
diff --git a/src/module/decode/DecoderFactory.java b/src/module/decode/DecoderFactory.java
index 19471fe9..645af4bc 100644
--- a/src/module/decode/DecoderFactory.java
+++ b/src/module/decode/DecoderFactory.java
@@ -222,11 +222,9 @@ public class DecoderFactory
 
                 if(channelType == ChannelType.STANDARD)
                 {
-                    long timeout = mptConfig.getCallTimeout() * 1000; //convert to milliseconds
-
                     modules.add(new TrafficChannelManager(channelModel, channelProcessingManager, decodeConfig,
                         channel.getRecordConfiguration(), channel.getSystem(), channel.getSite(),
-                        (aliasList != null ? aliasList.getName() : null), timeout, mptConfig.getTrafficChannelPoolSize()));
+                        (aliasList != null ? aliasList.getName() : null), mptConfig.getTrafficChannelPoolSize()));
                 }
 
                 modules.add(new FMDemodulatorModule(iqPass, iqStop));
@@ -264,12 +262,9 @@ public class DecoderFactory
 
                 if(channelType == ChannelType.STANDARD)
                 {
-                    //Set call timeout to 3 seconds for P25 traffic channels
-                    long timeout = 3000;
-
                     modules.add(new TrafficChannelManager(channelModel, channelProcessingManager, decodeConfig,
                         channel.getRecordConfiguration(), channel.getSystem(), channel.getSite(),
-                        (aliasList != null ? aliasList.getName() : null), timeout, p25Config.getTrafficChannelPoolSize()));
+                        (aliasList != null ? aliasList.getName() : null), p25Config.getTrafficChannelPoolSize()));
                 }
 
                 modules.add(new P25AudioModule(metadata));