diff --git a/mythtv/libs/libmythbase/msocketdevice.cpp b/mythtv/libs/libmythbase/msocketdevice.cpp
index 76afc03..cdba0ce 100644
--- a/mythtv/libs/libmythbase/msocketdevice.cpp
+++ b/mythtv/libs/libmythbase/msocketdevice.cpp
@@ -189,7 +189,11 @@ MSocketDevice::MSocketDevice( Type type )
            this, type );
 #endif
     init();
-    //setSocket( createNewSocket(), type );
+
+    // For the time being, if it's of type Datagram create the socket now
+    // rather than later during connect (since there wont be one with udp)
+    if (type == Datagram)
+        setSocket( createNewSocket(), type );
 }
 
 /*!