diff --git a/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp b/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp
index d0b169da71..4dfc0a30ee 100644
--- a/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp
+++ b/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp
@@ -510,7 +510,7 @@ void CEXIETHERNET::BuiltInBBAInterface::HandleUDPFrame(const Common::UDPPacket&
 void CEXIETHERNET::BuiltInBBAInterface::HandleUPnPClient()
 {
   StackRef* ref = GetAvailableSlot(0);
-  if (m_upnp_httpd.accept(ref->tcp_socket) != sf::Socket::Done)
+  if (ref == nullptr || m_upnp_httpd.accept(ref->tcp_socket) != sf::Socket::Done)
     return;
 
   if (ref->tcp_socket.GetPeerName(&ref->from) != sf::Socket::Status::Done ||
@@ -520,6 +520,13 @@ void CEXIETHERNET::BuiltInBBAInterface::HandleUPnPClient()
     return;
   }
 
+  if (m_current_ip == ref->from.sin_addr.s_addr)
+  {
+    ref->tcp_socket.disconnect();
+    WARN_LOG_FMT(SP1, "Ignoring UPnP request to itself");
+    return;
+  }
+
   ref->delay = GetTickCountStd();
   ref->ip = ref->from.sin_addr.s_addr;
   ref->local = ref->to.sin_port;