@@ -34,10 +34,12 @@
 
 #import <ObjOpenSSL/SSLSocket.h>
 #import <ObjOpenSSL/SSLInvalidCertificateException.h>
 #import <ObjOpenSSL/X509Certificate.h>
 
+#import <ObjFW/OFInvalidArgumentException.h>
+
 #import "XMPPConnection.h"
 #import "XMPPCallback.h"
 #import "XMPPSRVLookup.h"
 #import "XMPPEXTERNALAuth.h"
 #import "XMPPSCRAMAuth.h"
@@ -1053,10 +1055,23 @@
 
 - (uint16_t)port
 {
 	return port;
 }
+
+- (void)setDataStorage: (id <XMPPStorage>)dataStorage_
+{
+	if (streamOpen)
+		@throw [OFInvalidArgumentException exceptionWithClass: isa];
+
+	dataStorage = dataStorage_;
+}
+
+- (id <XMPPStorage>)dataStorage
+{
+	return dataStorage;
+}
 
 - (void)setLanguage: (OFString*)language_
 {
 	OF_SETTER(language, language_, YES, YES)
 }