diff --git a/src/remote/client/interface.cpp b/src/remote/client/interface.cpp
index e993ddf83cc..06fafa3d6c6 100644
--- a/src/remote/client/interface.cpp
+++ b/src/remote/client/interface.cpp
@@ -758,6 +758,12 @@ class Statement final : public RefCntIface<IStatementImpl<Statement, CheckStatus
 	void freeClientData(CheckStatusWrapper* status, bool force = false);
 	void internalFree(CheckStatusWrapper* status);
 
+	~Statement()
+	{
+		if (statement)
+			statement->rsr_self = NULL;
+	}
+
 	StatementMetadata metadata;
 	Attachment* remAtt;
 	Rsr* statement;
@@ -4340,6 +4346,8 @@ void Statement::freeClientData(CheckStatusWrapper* status, bool force)
 			clear_queue(rdb->rdb_port);
 			REMOTE_reset_statement(statement);
 		}
+		if (statement)
+			statement->rsr_self = NULL;
 		statement = NULL;
 	}
 	catch (const Exception& ex)