diff --git a/suites/aoip_smpp/esme_ms_sms_storeforward.py b/suites/aoip_smpp/esme_ms_sms_storeforward.py
index 3e7e4f8..308ebf3 100755
--- a/suites/aoip_smpp/esme_ms_sms_storeforward.py
+++ b/suites/aoip_smpp/esme_ms_sms_storeforward.py
@@ -39,17 +39,18 @@
 msg = Sms(esme.msisdn, wrong_msisdn, 'smpp message with wrong dest')
 esme.run_method_expect_failure(SMPP_ESME_RINVDSTADR, esme.sms_send_wait_resp, msg, esme.MSGMODE_STOREFORWARD)
 
-print('sending sms, it will be stored...')
-msg = Sms(esme.msisdn, ms.msisdn, 'smpp send not-yet-registered message')
-umref = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True)
+# Disabled due to known issue, see ticket OsmoSMSC #2354
+#print('sending sms, it will be stored...')
+#msg = Sms(esme.msisdn, ms.msisdn, 'smpp send not-yet-registered message')
+#umref = esme.sms_send_wait_resp(msg, esme.MSGMODE_STOREFORWARD, receipt=True)
 
 print('MS registers and will receive the SMS...')
 ms.connect(msc.mcc_mnc())
 wait(ms.is_connected, msc.mcc_mnc())
 wait(msc.subscriber_attached, ms)
-wait(ms.sms_was_received, msg)
-print('Waiting to receive and consume sms receipt with reference', umref)
-wait(esme.receipt_was_received, umref)
+#wait(ms.sms_was_received, msg)
+#print('Waiting to receive and consume sms receipt with reference', umref)
+#wait(esme.receipt_was_received, umref)
 
 print('checking MS can receive SMS while registered...')
 msg = Sms(esme.msisdn, ms.msisdn, 'smpp send already-registered message')