diff --git a/Client/Source/UserInterface/Dialogs/Payload.cpp b/Client/Source/UserInterface/Dialogs/Payload.cpp
index ad81d23e..77f2a3c3 100644
--- a/Client/Source/UserInterface/Dialogs/Payload.cpp
+++ b/Client/Source/UserInterface/Dialogs/Payload.cpp
@@ -201,6 +201,20 @@ void Payload::buttonGenerate()
 
         return;
     }
+    else
+    {
+        for ( auto& listener : HavocX::Teamserver.Listeners )
+        {
+            if ( ComboListener->currentText().toStdString() == listener.Name )
+            {
+                if ( listener.Status.compare( "Offline" ) == 0 )
+                {
+                    MessageBox( "Payload Generator Error", "Selected listener is offline", QMessageBox::Critical );
+                    return;
+                }
+            }
+        }
+    }
 
     ConsoleText->clear();
     ButtonClicked = true;