diff --git a/src/gui/instrument/EnvelopeAndLfoView.cpp b/src/gui/instrument/EnvelopeAndLfoView.cpp
index 9182b9d03..c9374e4ec 100644
--- a/src/gui/instrument/EnvelopeAndLfoView.cpp
+++ b/src/gui/instrument/EnvelopeAndLfoView.cpp
@@ -323,11 +323,7 @@ void EnvelopeAndLfoView::dropEvent( QDropEvent * _de )
 	QString value = StringPairDrag::decodeValue( _de );
 	if( type == "samplefile" )
 	{
-		if (!value.isEmpty())
-		{
-			m_params->m_userWave = SampleLoader::createBufferFromFile(value);
-		}
-
+		m_params->m_userWave = SampleLoader::createBufferFromFile(value);
 		m_userLfoBtn->model()->setValue( true );
 		m_params->m_lfoWaveModel.setValue(static_cast<int>(EnvelopeAndLfoParameters::LfoShape::UserDefinedWave));
 		_de->accept();
@@ -339,13 +335,8 @@ void EnvelopeAndLfoView::dropEvent( QDropEvent * _de )
 		auto file = dataFile.content().
 					firstChildElement().firstChildElement().
 					firstChildElement().attribute("src");
-
-		if (!file.isEmpty())
-		{
-			auto buffer = SampleLoader::createBufferFromFile(file);
-			m_params->m_userWave = std::shared_ptr<const SampleBuffer>(std::move(buffer));
-		}
-
+		auto buffer = SampleLoader::createBufferFromFile(file);
+		m_params->m_userWave = std::shared_ptr<const SampleBuffer>(std::move(buffer));
 		m_userLfoBtn->model()->setValue( true );
 		m_params->m_lfoWaveModel.setValue(static_cast<int>(EnvelopeAndLfoParameters::LfoShape::UserDefinedWave));
 		_de->accept();