diff --git a/ChangeLog b/ChangeLog
index 5df36629..547836a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19040,3 +19040,6 @@
 2019-08-29 Patrick Linstruth <patrick@deltecent.com>
 	* Modified caed(8) to skip JACK startup, rather than crash, if
 	no command line is specified in rdadmin(1).
+2019-08-29 Patrick Linstruth <patrick@deltecent.com>
+	* Refactored 'RDCddbLookup' class to use 'QTcpSocket' class
+	instead of 'Q3Socket'.
diff --git a/lib/rdcddblookup.cpp b/lib/rdcddblookup.cpp
index 9d3ef73d..9961c821 100644
--- a/lib/rdcddblookup.cpp
+++ b/lib/rdcddblookup.cpp
@@ -49,9 +49,9 @@ RDCddbLookup::RDCddbLookup(FILE *profile_msgs,QObject *parent)
   //
   // Socket
   //
-  lookup_socket=new Q3Socket(this,"lookup_socket");
+  lookup_socket=new QTcpSocket(this);
   connect(lookup_socket,SIGNAL(readyRead()),this,SLOT(readyReadData()));
-  connect(lookup_socket,SIGNAL(error(int)),this,SLOT(errorData(int)));
+  connect(lookup_socket,SIGNAL(error(QAbstractSocket::SocketError)),this,SLOT(errorData(QAbstractSocket::SocketError)));
 }
 
 
@@ -72,6 +72,10 @@ void RDCddbLookup::lookupRecord(const QString &cdda_dir,const QString &cdda_dev,
 			       const QString &username,const QString &appname,
 				const QString &appver)
 {
+  if(lookup_record->tracks()==0) {
+    return;
+  }
+
   lookup_username=username;
   lookup_appname=appname;
   lookup_appver=appver;
@@ -249,18 +253,20 @@ void RDCddbLookup::readyReadData()
 }
 
 
-void RDCddbLookup::errorData(int err)
+void RDCddbLookup::errorData(QAbstractSocket::SocketError err)
 {
   switch(err) {
-      case Q3Socket::ErrConnectionRefused:
+      case QTcpSocket::ErrConnectionRefused:
 	printf("CDDB: Connection Refused!\n");
 	break;
-      case Q3Socket::ErrHostNotFound:
+      case QTcpSocket::ErrHostNotFound:
 	printf("CDDB: Host Not Found!\n");
 	break;
-      case Q3Socket::ErrSocketRead:
+      case QTcpSocket::ErrSocketRead:
 	printf("CDDB: Socket Read Error!\n");
 	break;
+      default:
+        break;
   }
   lookup_state=0;
   emit done(RDCddbLookup::NetworkError);
diff --git a/lib/rdcddblookup.h b/lib/rdcddblookup.h
index a366e897..aa15b1bd 100644
--- a/lib/rdcddblookup.h
+++ b/lib/rdcddblookup.h
@@ -25,7 +25,7 @@
 #include <stdio.h>
 
 #include <qobject.h>
-#include <q3socket.h>
+#include <qtcpsocket.h>
 #include <rdcddbrecord.h>
 
 //
@@ -62,7 +62,7 @@ class RDCddbLookup : public QObject
 
   private slots:
    void readyReadData();
-   void errorData(int);
+   void errorData(QAbstractSocket::SocketError);
 
   signals:
    void done(RDCddbLookup::Result);
@@ -77,7 +77,7 @@ class RDCddbLookup : public QObject
    void SendToServer(const QString &msg);
    void Profile(const QString &msg);
    RDCddbRecord *lookup_record;
-   Q3Socket *lookup_socket;
+   QTcpSocket *lookup_socket;
    int lookup_state;
    QString lookup_username;
    QString lookup_appname;