diff --git a/src/user.cpp b/src/user.cpp
index 7049dc33adf50d9402da51d5ea5f398c546bab2c..47d63065a991f3473bf9adfce07ec16d0f9291f7 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -97,6 +97,10 @@ Swift::JID User::getJIDWithFeature(const std::string &feature) {
 			else {
 				continue;
 			}
+
+			if (!discoInfo) {
+				continue;
+			}
 #else
 			continue;
 #endif