diff --git a/src/sound/oalsound.cpp b/src/sound/oalsound.cpp
index b697282bb..c14855ea1 100644
--- a/src/sound/oalsound.cpp
+++ b/src/sound/oalsound.cpp
@@ -649,6 +649,16 @@ static size_t GetChannelCount(ChannelConfig chans)
        return 0;
 }
 
+static size_t GetSampleSize(SampleType type)
+{
+       switch(type)
+       {
+               case SampleType_UInt8: return 1;
+               case SampleType_Int16: return 2;
+       }
+       return 0;
+}
+
 static float GetRolloff(const FRolloffInfo *rolloff, float distance)
 {
        if(distance <= rolloff->MinDistance)
@@ -1241,7 +1251,7 @@ std::pair<SoundHandle,bool> OpenALSoundRenderer::LoadSound(uint8_t *sfxdata, 
int
        {
                size_t chancount = GetChannelCount(chans);
                size_t frames = data.Size() / chancount /
-                                               (type == SampleType_Int16 ? 2 : 1);
+                               GetSampleSize(type);
                if(type == SampleType_Int16)
                {
                        short *sfxdata = (short*)&data[0];
@@ -1283,6 +1293,8 @@ std::pair<SoundHandle,bool> OpenALSoundRenderer::LoadSound(uint8_t *sfxdata, 
int
        if (!endass) loop_end = Scale(loop_end, srate, 1000);
        if (loop_start < 0)     loop_start = 0;
 
+       loop_end = MIN<uint32_t>(loop_end, data.Size() / GetChannelCount(chans) /
+                                          GetSampleSize(type));
        if ((loop_start > 0 || loop_end > 0) && loop_end > loop_start && AL.SOFT_loop_points)
        
{
                ALint loops[2] = { static_cast<ALint>(loop_start), static_cast<ALint>(loop_end) 
};